ProPR
Log in Get ProPR

Update a stale PR branch.

The base branch moved. One comment brings it into the PR branch, an agent resolves the conflicts, and ProPR reports back through the same GitHub comment controls you use for fixes and reviews.

Describe
Run isolated
Review in GitHub

Feature overview

You start with
A ProPR pull request behind its base branch
You use
/merge
Takes
One comment

Comment /merge

ProPR merges the base branch into the PR branch.

@maintainercommented on this pull request

/merge

An agent resolves the conflicts

The agent removes the markers and keeps the PR's intent, in an isolated workspace.

A /merge run on the pull request: merge main into the branch, resolve the conflict in CheckoutSummary.tsx, run the checkout tests

Review one more commit

ProPR commits the result and reports it on the PR, with an undo link.

@propr-dev[bot]example response

Branch updated. Merged main into the PR branch and resolved the conflicts while preserving the pull request intent.

Undo Changes  ·  View Task Execution

claude-cope #870: a real conflict, resolved.

A real ProPR merge-conflict resolution on a GitHub pull request: a /merge comment, then the bot's resolved-conflicts reply listing the conflicting files and resolution summary.
A real /merge conflict resolution on claude-cope #870.

What you get

ProPR merges the current base into your PR branch, an agent resolves the conflicts, and you review the commit like any other.

GitHub comment controls → All playbooks