Installs into .claude/skills of the current project.
Sponsors
SSkills DirectorySkills Directory
Know which skills are safe — weekly.
SSkills DirectorySkills Directory
Is that skill safe to install?
Are you the author of Fix Merge Conflicts?
Add the live security badge to your README. It updates with every re-scan.
[](https://www.skillsdirectory.com/skills/jaydubya818-fix-merge-conflicts)
---
name: fix-merge-conflicts
description: "Use when a branch needs conflicts resolved and the merged result verified."
license: MIT
metadata:
author: jstack-maintainers
source: michael-denyer/pstack-claude
source-version: "0.9.130"
source-commit: d88063f3355a5ecff0e6dbb890a11bab4b08bc2e
owner: software-factory
risk: high
capabilities: jstack,pull-request-workflow
---
# Fix merge conflicts
## Trigger
Branch has unresolved merge conflicts and needs a reliable path to a buildable state.
## Workflow
1. Detect all conflicting files from git status and conflict markers.
2. Resolve each conflict with minimal, correctness-first edits.
3. Prefer preserving both sides when safe. Otherwise, choose the variant that compiles and keeps public behavior stable.
4. Regenerate lockfiles with package manager tools instead of hand-editing.
5. Run compile, lint, and relevant tests.
6. 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
