fix-merge-conflicts
From the author
Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution
Install
npx skills add michael-denyer/pstack-claude --skill fix-merge-conflicts -a claude-code
Installs to .claude/skills/fix-merge-conflicts/ · Each command fetches the skill straight from GitHub with the open skills CLI.
Download .zip
Byte-identical to the scanned commit, with the repository’s licence and a SOURCE.txt.
Want your agent to suggest skills while you type? See how to use skills from your IDE.
Safety checks on SKILL.md
No warnings.
Why 90
Security100
Provenance82
Maintenance100
Licence100
Adoption56
aiqbench computes the trust score from public signals. It is not a security audit, so read a skill before you install it.
Similar skills
Closest to this one by what they do and when they are used.
- gsd:audit-fixdavepoon/buildwithclaudeAutonomous audit-to-fix pipeline — find issues, classify, fix, test, commitTesting★ 3.7K
- build-testnexu-io/open-designRun the project's build / typecheck / lint / test commands and emit the build.passing + tests.passing signals devloop convergence reads.Testing★ 102.9K
- dart-add-unit-testflutter/agent-pluginsWrite and organize unit tests for functions, methods, and classes using `package:test`. Use when creating new logic or fixing bugs to ensure code remains correct and regression-free.OfficialTesting★ 3.1K
- parallel-debuggingwshobson/agentsDebug complex issues using competing hypotheses with parallel investigation, evidence collection, and root cause arbitration. Use this skill when debugging bugs with multiple potential causes, performing root cause analysis, or organizing parallel investigation workflows.Engineering★ 41.4K
- testingdavepoon/buildwithclaudeTesting strategies and methodologies including TDD, E2E testing, and multi-framework supportTesting★ 3.7K
- golden-html-multiyusufkaraaslan/Skill_SeekersUse when testing the multi-file html buildTesting★ 15.2K
Ratings & reviews
—
no reviews
Tried this skill? Rate it to help others. Sign in
Discussion
Join the discussion. Sign in