Resolve Conflicts
antinomyhq/forgeMerge conflicts happen when two people change the same file in different ways. This skill gives you a clear plan to fix them. You start by checking what files are broken. Then you build a step-by-step plan and show it for approval. Once approved, you carefully combine changes. The goal is to keep both changes unless they fight each other. This keeps your work safe and your project healthy.
This method works for all kinds of conflicts. It handles deleted files, test files, and generated files like lock files. It always backs up important files before changing them. After you finish, it runs tests to make sure everything still works. If something is unclear, it asks you what to do. The result is a clean merge that respects everyone's work.
Add Resolve Conflicts skill to your workflow
Global
mkdir -p ~/.claude/skills/resolve-conflictsProject
mkdir -p .claude/skills/resolve-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