PR Conflict Resolver

Resolve merge conflicts on the current branch carefully. Preserve intent, avoid silent guesses, and ask the user whenever the correct resolution is not clearly supported by the code or surrounding context.

Scope

Use this skill when the user wants help with a conflicted PR or branch, including requests like:

• "fix PR conflicts"
• "resolve merge conflicts"
• "rebase and handle conflicts"
• "help me choose the right side of this conflict"

This skill is for conflict resolution in the current repository and current branch.

Rules