When using claude --worktree, the new worktree branches from the current HEAD. If I'm checked out to a feature branch or inside another worktree, the new worktree is based on that branch instead of the remote default (e.g., origin/main).
Problem
In my workflow, I often invoke claude -w while already on a feature branch. This means the worktree starts from that branch's state rather than the latest origin/main, which is almost never what I want. I have to remember to switch to main first, or manually create the worktree with git commands.
Proposed solution
Add a worktree.baseBranch setting in settings.json:
{
"worktree": {
"baseBranch": "origin/main"
}
}When set, claude --worktree would always create the new worktree from the specified ref, regardless of the current checkout. When unset, behavior stays as-is (branch from current HEAD).
Workaround
Manually creating the worktree and launching Claude inside it:
git worktree add .claude/worktrees/my-task -b my-task origin/main
cd .claude/worktrees/my-task && claude
When using
claude --worktree, the new worktree branches from the current HEAD. If I'm checked out to a feature branch or inside another worktree, the new worktree is based on that branch instead of the remote default (e.g.,origin/main).Problem
In my workflow, I often invoke
claude -wwhile already on a feature branch. This means the worktree starts from that branch's state rather than the latestorigin/main, which is almost never what I want. I have to remember to switch tomainfirst, or manually create the worktree with git commands.Proposed solution
Add a
worktree.baseBranchsetting insettings.json:{ "worktree": { "baseBranch": "origin/main" } }When set,
claude --worktreewould always create the new worktree from the specified ref, regardless of the current checkout. When unset, behavior stays as-is (branch from current HEAD).Workaround
Manually creating the worktree and launching Claude inside it: