Resolve Git Conflicts

Use when Git merge or rebase results in merge conflicts that need resolution, detected via `git status` showing unmerged files or conflict markers in code

shenjingnan Updated 347 repo stars

File contents

shenjingnan/api2mcp commit 8a12aa8e47

Frequently asked questions

npx get-skill add shenjingnan/resolve-git-conflicts-3