Back to Uv

Rebase Pull Request

agents/prompts/rebase-pull-request.md

0.11.30766 B
Original Source

Rebase the checked-out pull request onto refs/remotes/origin/$BASE_REF and resolve its conflicts.

  • Inspect the conflicted files and preserve the intent of both the pull request and its updated base.
  • Resolve every conflict, stage the resolved files, and run GIT_EDITOR=true git rebase --continue. Repeat until the rebase completes; later commits may introduce additional conflicts.
  • Run the relevant formatting and lint checks, fix any failures introduced by the rebase, and prefer focused checks over the full suite.
  • Keep the changes narrowly scoped to the pull request. Do not add dependencies, run release builds, or make unrelated cleanups.
  • Do not abort the rebase or push the branch. The workflow will verify and push the completed rebase.