michael-denyer/pstack-claude490 installs
fix-merge-conflicts
Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution
How do I install this agent skill?
npx skills add https://github.com/michael-denyer/pstack-claude --skill fix-merge-conflictsIs this agent skill safe to install?
- Gen Agent Trust Hubpass
The skill automates merge conflict resolution and build validation. It is generally safe but carries a low risk of indirect prompt injection because it processes untrusted code from conflict markers and executes build/test commands based on that code.
- Socketpass
No alerts
- Snykpass
Risk: LOW · No issues
What does this agent skill do?
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
How can the creator link this skill?
Add the canonical catalog link to the repository README so users can inspect current installs and available audits. The publishing guide covers the complete discovery path.
<a href="https://skillzs.dev/skills/michael-denyer/pstack-claude/fix-merge-conflicts">View fix-merge-conflicts on skillZs</a>