CAI Resolve Conflicts

Rebases a pull request onto its base branch, asking the resolve_step agent to clear conflict markers commit-by-commit. Runs a sanity test pass after a non-trivial rebase before force-pushing the rewritten head.

Graph

---
title: conflicts_graph
---
stateDiagram-v2
  RebaseLoopNode --> SanityTestNode
  RebaseLoopNode --> PushNode
  RebaseLoopNode --> ObsoleteNode
  SanityTestNode --> PushNode
  SanityTestNode --> [*]
  PushNode --> [*]
  ObsoleteNode --> [*]