Merge the winning agent branch back to main

ai agents & parallel sessions

// what it does

Because all worktrees share one repository, integrating an agent's work needs no push or pull: from the worktree where main is checked out, merge the winning branch directly, or cherry-pick the best commits out of several attempts. For team review, push the branch and open a PR instead.

// shell

$ git merge agent/auth
$ git cherry-pick 4f2a91c
$ git push -u origin agent/search

// gotcha

Run the merge from the worktree that has main checked out. Git refuses to move a branch that's checked out in another worktree ("cannot force update the branch"), so you can't fast-forward main from inside an agent's worktree while your main checkout holds it.

// resources