Claude Skill

fix-merge-conflicts

Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution

LLM Mart · 0 points · 0 0 0

Virus-scanned Reviewed automatically before listing.

Full trust report

Download michael-denyer-pstack-claude-plugins_pstack_skills_fix-merge-conflicts-4b3933e.zip · 0 KB

michael-denyer/pstack-claude 677 83 forks MIT Updated 2d ago

Part of michael-denyer/pstack-claude — 51 skills

Install

skills CLI npx skills add https://github.com/michael-denyer/pstack-claude/tree/main/plugins/pstack/skills/fix-merge-conflicts

Claude Code

claude plugin marketplace add https://llmmart.ai/marketplace.json && claude plugin install michael-denyer-pstack-claude@llmmart

Git git clone https://github.com/michael-denyer/pstack-claude.git

The skills CLI installs just this skill, for any of its supported agents. Claude Code installs the whole michael-denyer/pstack-claude collection as a plugin from our marketplace. Git is the plain clone.

Skill manifest

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

Files (pstack-claude)

SKILL.md 988 B

---
name: fix-merge-conflicts
description: Resolve 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

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