Today if main moves ahead and an agent/* branch has conflicts, the PR just goes stale, there's no mechanism to detect or resolve this. The fix agent also always adds new commits and can never rewrite history since push-to-pull-request-branch only supports appending.
We need the agent to be able to:
- Detect when its PR has merge conflicts with the target branch
- Rebase onto latest main and resolve conflicts
- Force-push the result (needs a new safe-output mode or --force support in push-to-pull-request-branch)
- Squash/amend fixup commits to keep history clean before merge
Today if main moves ahead and an agent/* branch has conflicts, the PR just goes stale, there's no mechanism to detect or resolve this. The fix agent also always adds new commits and can never rewrite history since push-to-pull-request-branch only supports appending.
We need the agent to be able to: