Update a PR branch and handle conflicts.

When the target branch has moved, one comment in the PR conversation starts the branch update. If conflicts appear, ProPR hands the cleanup to an agent and brings the result back through the same GitHub comment control surface used for fixes, reviews, and recovery.

Describe
Run isolated
Review in GitHub

Feature overview

Request branch update

Comment /merge on the pull request. ProPR merges the base branch into the PR branch and brings it up to date.

@maintainercommented on this pull request

/merge

ProPR starts conflict cleanup

If conflicts appear, the cleanup moves through the same isolated task path as other changes.

Agent resolves conflicts

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

Review the result

ProPR commits the outcome and reports it in GitHub for normal review, so the PR stays the team-visible boundary.

@propr-dev[bot]example response

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

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 #874