Fix Merge Conflicts
cursor/pluginsMerge conflicts can slow down your work. This tool helps you fix them quickly and safely. It finds all conflicting files and resolves them with minimal changes. The goal is to keep your code building and passing tests. No manual edits or leftover markers are allowed. You get a clean resolution every time.
Developers and teams benefit from faster conflict resolution. The process is automatic and avoids breaking anything. It prefers to keep both sides of a change when possible. The result is a stable codebase ready to move forward.
Add Fix Merge Conflicts skill to your workflow
Global
mkdir -p ~/.claude/skills/fix-merge-conflictsProject
mkdir -p .claude/skills/fix-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