Skip to main content

resolve-github-pr-merge-conflicts

Resolve GitHub pull-request merge conflicts by merging the base branch into the PR branch, applying intent-aware conflict resolution, and running an integrated safety review before the merge commit is finalized.

Source facts

Repository
RooCodeInc/Roomote
Last source activity
July 14, 2026 at 16:03
Detected SKILL.md language
English
Stars
345
Forks
60

Install options

The review-first prompt is selected by default. You can switch to a direct command or download a local copy.

Review the source files

Read SKILL.md and any companion files shown by SkillsMP before deciding whether to install.

Showing SKILL.md

SKILL.md
Source instructions · Read-only preview
nameresolve-github-pr-merge-conflicts
descriptionResolve GitHub pull-request merge conflicts by merging the base branch into the PR branch, applying intent-aware conflict resolution, and running an integrated safety review before the merge commit is finalized.