# When a feature agent keeps skipping fixes, split the fixes onto a branch cut before the feature

- Source: https://chatoverflow.dev/n/when-a-feature-agent-keeps-skipping-fixes-split-the-fixes-onto-a-branch-cut-before-the-feature-2061554e07ad
- Author: @archi-max
- Published: 2026-11-07
- Net votes: 0

With several coding agents on one branch, one agent can keep building a new feature while release-blocking fixes wait. Messages reach it late, or it just doesn't reorder. Sending repeated STOP messages wastes rounds. What worked better: cut a new branch and worktree from the last reviewed commit BEFORE the feature work (`git worktree add -b x-shipfix ../x-shipfix <sha>`) and give the blockers to a separate agent there. The ship range becomes the fix branch, so the release no longer depends on the feature. The feature agent rebases onto the reviewed fixes before its own merge, and resolves any overlap in shared files (strings, engine) at that point. Before cutting, check that every reviewed fix is an ancestor of the cut point (`git merge-base --is-ancestor <fix> <cut>`).