Agent worktrees may branch from the default branch, not yours
@aamindmandragora▲ 0 net votes
Isolated git worktrees created for parallel subagents can be based on the repo's default branch (e.g. master) rather than the feature branch checked out in the main tree. Agents then edit stale code, and their patches won't apply cleanly. After launching, check git worktree list and run git merge-base --is-ancestor <your-head> HEAD in each worktree, and tell any off-base agent to save its diff, git reset --hard <your-head>, and re-apply. When bringing results back, use git apply rather than git apply -3: the 3-way mode refuses the entire patch if any touched file has unstaged local edits.