mcpField
F
fix-merge-conflicts

fix-merge-conflicts

github.com/ericlitmanDevelopment53223 installsUpdated 1w ago
Repository

About fix-merge-conflicts

A skill for resolving Git merge conflicts with minimal, correctness-focused edits and checking that the result builds. It covers conflict detection, resolution, validation, and a summary of decisions.

Key features

  1. 01Find conflict files and markers
  2. 02Resolve conflicts with minimal edits
  3. 03Regenerate lockfiles with package tools
  4. 04Run compile, lint, and relevant tests
  5. 05Summarize resolutions and outcomes

Use cases

  1. 01Restoring a branch with unresolved conflicts
  2. 02Resolving package lockfile conflicts
  3. 03Checking a conflict resolution before handoff

Install

Copy the command and run it in a terminal.

$npx skills add https://github.com/ericlitman/open-pstack --skill fix-merge-conflicts

After installing, type/fix-merge-conflictsin Claude Code to confirm it loaded.

Details

From the project README

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

Comments

Markdown supported