Resolve Merge Conflicts

Resolve PR merge conflicts end-to-end by identifying the base branch, merging it locally, fixing conflicted files carefully, validating the result, and pushing the updated branch. Use when the user asks to look at merge conflicts on a PR, resolve them, and push the branch.

arjitj2 Updated 16 repo stars

File contents

arjitj2/arjit-skills commit bb3258b74f

Frequently asked questions

npx get-skill add arjitj2/resolve-merge-conflicts