Git Resolve Merge Conflicts

Resolve git merge conflicts by inspecting both sides, consulting recent local project context, applying safe resolutions, and completing the merge when the resolution is clear.

lefant Updated 1 repo stars

File contents

lefant/agent-skills commit a5025db84e

Frequently asked questions

npx get-skill add lefant/git-resolve-merge-conflicts