Resolve Merge Conflicts

Use this skill when a user wants merge conflicts on an active PR resolved all the way through, not just inspected.

The goal is:

• identify the PR base branch
• merge the base into the current branch locally
• resolve the conflicted files without discarding intentional branch work
• validate the merged result
• commit the merge
• push the updated branch

Preconditions

• the current branch should already be the PR branch you intend to update
• gh should be authenticated for the repo if you need to inspect PR metadata
• do not assume a conflict is already present locally; check first

Workflow