Update a PR branch and handle conflicts.

The target branch moved. One comment updates the PR branch. If conflicts appear, an agent resolves them and ProPR reports back through the same GitHub comment controls you use for fixes and reviews.

Describe

Run isolated

Review in GitHub

You start with: A ProPR pull request behind its base branch
You use: /merge
Takes: One comment; conflict resolution runs as a task
Real run: claude-cope #870

Request branch update

Comment /merge on the pull request. ProPR merges the base branch into the PR branch.

@maintainercommented on this pull request

/merge

ProPR starts conflict cleanup

Conflicts go to an isolated task, like any other change.

Agent resolves conflicts

The agent removes the conflict markers while preserving the PR intent.

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

Review the result

ProPR commits the result and reports it on the PR for normal review.

@propr-dev[bot]example response

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

Commit created · Task record available · Revert this change

What it looks like on the PR.

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 — claude-cope #870

What you get

A PR branch with the current base merged in, conflicts resolved by an agent that kept the PR's intent, and a commit you review like any other.

GitHub comment controls → All playbooks