Resolve Merge Conflicts
warpdotdev/common-skillsWhen you run into a Git merge conflict, this skill helps you fix it step by step. It shows only the parts of files that need attention. You do not have to open the whole file and search for markers. This saves time and keeps your work focused.
The skill uses a script that lists all unresolved files. Then you can look at one file at a time. It shows the different versions of the code with clear labels. You can pick one side, edit the file, or run tests to make sure everything works. The goal is to clean up conflicts quickly and correctly.
Anyone who uses Git for teamwork can benefit. Whether you are merging branches or applying patches, this skill makes the process smoother. It gives you a compact view of each conflict so you can decide the best resolution without extra clutter.
Add Resolve Merge Conflicts skill to your workflow
Global
mkdir -p ~/.claude/skills/resolve-merge-conflictsProject
mkdir -p .claude/skills/resolve-merge-conflictsSource Repository
More Git & Pull Requests Claude Code Skills
Caveman Commitjuliusbrussee/caveman
Generate ultra-compressed commit messages with Conventional Commits format
Verification Before Completionobra/superpowers
Always run fresh verification before claiming work is complete or passing
Git Guardrails Claude Codemattpocock/skills
Stop dangerous git commands from running automatically with safety hooks
Setup Pre Commitmattpocock/skills
Automate code formatting type checking and tests before every commit
Using Git Worktreesobra/superpowers
Isolate your feature work with git worktrees and keep your main branch safe
Finishing A Development Branchobra/superpowers
Finish your development branch with merge, pull request, or cleanup options
Resolving Merge Conflictsmattpocock/skills
Resolve Git merge conflicts step by step preserving both intents
Git Commitgithub/awesome-copilot
Automatically write standardized git commits by analyzing your code changes