Skip to content

Add a make command for setting up a git worktree locally#14101

Open
jamesspeake wants to merge 2 commits into
masterfrom
make-configure-worktree
Open

Add a make command for setting up a git worktree locally#14101
jamesspeake wants to merge 2 commits into
masterfrom
make-configure-worktree

Conversation

@jamesspeake

Copy link
Copy Markdown
Contributor

Changelog

Technical

  • Additional make command for setting up git worktrees

@jamesspeake jamesspeake requested a review from kogre June 17, 2026 12:08

@kogre kogre left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems fine, though claude supports a .worktreeinclude file, which automatically copies over these files if Claude manages the worktree (e.g. claude --worktree).

To me that's the primary workflow, so I'd rather go with the solution, but not sure whether you or others use worktrees outside of Claude?

@cl-dev-bot

Copy link
Copy Markdown
Collaborator
Warnings
⚠️ The PR title contains no Jira issue key (case-sensitive)
⚠️ The branch name contains no Jira issue key (case-sensitive)
Messages
📖 Changelog provided 🎉
📖

Run the e2e tests

📖 Check translation progress

Generated by 🚫 dangerJS against 4f60162

@jamesspeake

Copy link
Copy Markdown
Contributor Author

Seems fine, though claude supports a .worktreeinclude file, which automatically copies over these files if Claude manages the worktree (e.g. claude --worktree).

To me that's the primary workflow, so I'd rather go with the solution, but not sure whether you or others use worktrees outside of Claude?

Yeah @kogre, I didn't know about those claude commands but I'm also using worktrees in RubyMine now and actually I was a little premature in sharing this PR with you - probably makes more sense now as I've added the ability to have an independent docker stack for the worktree as I was finding it painful when claude was working on different worktrees and trying to test the output without rebuilding etc.

Both stacks can't be run at the same time because of port conflicts, but it's an improvement and allows you to have different local data on different worktrees. wdy?

@jamesspeake jamesspeake requested a review from kogre June 17, 2026 17:26

@kogre kogre left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants