About fix-merge-conflicts
fix-merge-conflicts is a skill for resolving Git merge conflicts while keeping changes minimal and the project buildable. It guides developers from conflict detection through validation and a summary of decisions.
Key features
- 01Detect conflicting files and markers
- 02Resolve conflicts with minimal edits
- 03Regenerate lockfiles with package tools
- 04Run compile, lint, and relevant tests
- 05Stage resolved files and summarize choices
Use cases
- 01Restoring a branch to a buildable state after a merge
- 02Validating conflict resolutions before continuing development
Install
Copy the command and run it in a terminal.
$
npx skills add https:/After installing, type/fix-merge-conflictsin Claude Code to confirm it loaded.
Details
From the project READMEFix merge conflicts
Trigger
Branch has unresolved merge conflicts and needs a reliable path to a buildable state.
Workflow
- Detect all conflicting files from git status and conflict markers.
- Resolve each conflict with minimal, correctness-first edits.
- Prefer preserving both sides when safe. Otherwise, choose the variant that compiles and keeps public behavior stable.
- Regenerate lockfiles with package manager tools instead of hand-editing.
- Run compile, lint, and relevant tests.
- Stage resolved files and summarize key decisions.
Guardrails
- Keep changes minimal and readable.
- Do not leave conflict markers in any file.
- Avoid broad refactors while resolving conflicts.
- Do not push or tag during conflict resolution.
Output
- Files resolved
- Notable resolution choices
- Build/test outcome
Comments
Markdown supported