Fix Merge Conflicts
Resolve Git merge conflicts in active branches by interpreting conflict markers, choosing correct hunks, and preserving intent across overlapping edits.
npx skills add https://github.com/cursor/plugins --skill fix-merge-conflicts| Installs | 629 |
|---|---|
| Repository | cursor/plugins ↗ |
Related skills
TriageTriage project issues through bug/enhancement categories and states from needs-triage to ready-for-agent or wontfix.208k121k
Caveman CommitGenerate ultra-terse Conventional Commits messages from staged changes, with a short body only when the rationale is not obvious from the subject.168k70k
Using Git WorktreesCreate or confirm an isolated branch workspace before feature implementation or plan execution so the main checkout stays untouched.105k221kFinishing A Development BranchAfter implementation and green tests, choose merge locally, open a PR, keep the branch, or discard work—with cleanup matched to normal repo vs worktree layout.103k221kGit Guardrails Claude CodeInstall a Claude Code PreToolUse hook so your agent cannot run destructive git commands without you explicitly changing policy.49.9k121kSetup Pre CommitAdd Husky pre-commit hooks with lint-staged Prettier, plus typecheck and tests so bad commits never land on main.47k121k