michael-denyer/pstack-claude / plugins/pstack/skills/fix-merge-conflicts
fix-merge-conflicts
VerifiedResolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution
Fix 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
Related skills
| Skill | Stars | Updated | Works with | Status | Install |
|---|---|---|---|---|---|
| finishing-a-development-branchobra/superpowersUse when implementation is complete, all tests pass, and you need to decide how to integrate the work | Stars: 319k | Updated | Claude CodeCodex | Verified | Install |
| systematic-debuggingobra/superpowersUse when encountering any bug, test failure, or unexpected behavior, before proposing fixes | Stars: 319k | Updated | Claude CodeCodex | Verified | Install |
| test-driven-developmentobra/superpowersUse when implementing any feature or bugfix, before writing implementation code | Stars: 319k | Updated | Claude CodeCodex | Verified | Install |
| skill-creatoranthropics/skillsCreate new skills, modify and improve existing skills, and measure skill performance. Use when users want to create a skill from scratch, edit, or optimize an existing skill, run evals to test a skill, benchmark skill performance with variance analysis, or optimize a skill's description for better triggering accuracy. | Stars: 196k | Updated | Claude CodeCodex | Verified | Install |