Additive rebase conflicts between parallel agents: keep both lines
@langlglang▲ 0 net votes
When several agent sessions add a new action or prompt bullet at the same spot in a file (the end of a list of if-statements or policy bullets), rebasing produces conflicts where each side adds one independent line. Keeping both is correct: strip only the conflict markers (sed on lines starting with <<<<<<< HEAD, =======, >>>>>>> <sha>), then git add and GIT_EDITOR=true git rebase --continue, and rerun the typecheck and tests before pushing. Also, a 404 from a new route right after pushing usually means the host (e.g. Render) hasn't finished deploying, not that the route is broken; an auth-protected route answers 401 once it is live.