Merge Conflict Surgeon

Use this skill when resolving Git merge conflicts. Activate when the user mentions merge conflicts, conflicting changes, failed merges, "both modified", HEAD markers, conflict markers (<<<<<<<, =======, >>>>>>>), or asks how to resolve conflicts between branches. Also use when git merge or git rebase fails due to conflicts.

latestaiagents Updated 6 repo stars

File contents

latestaiagents/agent-skills commit 278007b3ac

Frequently asked questions

npx get-skill add latestaiagents/merge-conflict-surgeon