resolving-merge-conflicts
From the author
Use when you need to resolve an in-progress git merge/rebase conflict.
Install
npx skills add tt-a1i/matt-skills-with-to-goal --skill resolving-merge-conflicts -a claude-code
Installs to .claude/skills/resolving-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 84
Security100
Provenance67
Maintenance100
Licence100
Adoption38
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.
- ase-repo-resolverse/aseResolve the Git merge conflicts of a working directory -- of an in-progress merge, rebase, cherry-pick, revert, stash apply, or of conflict markers left by patch -- carefully and semantically, never losing any change, escalate unresolvable hunks as-is, continue the in-progress operation, and emit a RESOLVED, PARTIAL, NONE, or FAILED verdict. Use when the user calls to "resolve" or "fix" merge conflicts.Engineering★ 60
- ase-repo-mergerse/aseMerge a Git source branch, including its still uncommitted changes, into a target branch through a regular merge, a rebase with fast-forward, or a squash merge, resolving merge conflicts semantically, check that the source branch landed, and emit a MERGED, CONFLICT, or FAILED verdict. Use when the user calls to "merge", "integrate", or "land" a branch.Engineering★ 60
- fix-merge-conflictsmichael-denyer/pstack-claudeResolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolutionTesting★ 3.4K
- git-commitsandbaseai/sandbase-skillsPlan, implement, or review git commit work in an existing codebase with compatibility, security, and verification controls. Use when the user explicitly requests git commit work.Engineering★ 203
- git-workflowjezweb/claude-skillsGuided git workflows: prepare PRs, clean up branches, resolve merge conflicts, handle monorepo tags, squash-and-merge patterns. Use when asked to prepare a PR, clean branches, resolve conflicts, or tag a release.Engineering★ 1.1K
- hk-merge-resolvedeepklarity/harness-kitResolve merge conflicts in the current branch. Only invoke when the user explicitly runs /hk-merge-resolve. Do NOT auto-trigger on mentions of merge conflicts, conflict markers, or similar keywords.Other★ 102
Ratings & reviews
—
no reviews
Tried this skill? Rate it to help others. Sign in
Discussion
Join the discussion. Sign in