Resolving Merge Conflicts alternatives
12 skills that do a similar job to Resolving Merge Conflicts in Productivity & Office, ranked by rating and usage.
View Resolving Merge Conflicts →skillclaude_appclaude_codeclaude_api
npx skills add obra/superpowers
Finishing A Development Branch
Use when implementation is complete, all tests pass, and you need to decide how to integrate the work198,790+
skillclaude_appclaude_codeclaude_api
npx skills add obra/superpowers
Systematic Debugging
Use when encountering any bug, test failure, or unexpected behavior, before proposing fixes284,215+
skillclaude_appclaude_codeclaude_api
npx skills add obra/superpowers
Receiving Code Review
Use when receiving code review feedback, before implementing suggestions, especially if feedback seems unclear or technically questionable - requires…205,284+
skillclaude_appclaude_codeclaude_api
npx skills add mattpocock/skills
Diagnosing Bugs
Diagnosis loop for hard bugs and performance regressions. Use when the user says "diagnose"/"debug this", or reports something broken/throwing/failing…746,030+
skillclaude_appclaude_codeclaude_api
npx skills add mattpocock/skills
Implement
Implement a piece of work based on a spec or set of tickets.688,084+
skillclaude_appclaude_codeclaude_api
npx skills add obra/superpowers
Using Git Worktrees
Use when starting feature work that needs isolation from current workspace or before executing implementation plans - ensures an isolated workspace ex…202,261+
skillclaude_appclaude_codeclaude_api
npx skills add mattpocock/skills
PR
Use when writing a PR body.61,057+
skillclaude_appclaude_codeclaude_api
npx skills add mattpocock/skills
Wayfinder
Plan a huge chunk of work (more than one agent session can hold) as a shared map of decision tickets on your issue tracker, and resolve them one at a…635,812+
skillclaude_appclaude_codeclaude_api
npx skills add obra/superpowers
Verification Before Completion
Use when about to claim work is complete, fixed, or passing, before committing or creating PRs - requires running verification commands and confirming…225,571+
skillclaude_appclaude_codeclaude_api
npx skills add obra/superpowers
Executing Plans
Use when executing an implementation plan in the current session as the implementer yourself — your human partner chose inline execution, or no subage…243,705+
skillclaude_appclaude_codeclaude_api
npx skills add juliusbrussee/caveman
Caveman Review
Compressed code review - one line per finding with location, problem and fix. Use for /caveman-review, "review this PR", or "review the diff".378,839+
skillclaude_appclaude_codeclaude_api
npx skills add obra/superpowers
Writing Plans
Use when you have a spec or requirements for a multi-step task, before touching code263,646+
Frequently asked questions
What is the best alternative to Resolving Merge Conflicts?
Ranked by rating and usage on AI Khazna, the top alternative is Finishing A Development Branch. Use when implementation is complete, all tests pass, and you need to decide how to integrate the work
How many alternatives to Resolving Merge Conflicts are there?
AI Khazna lists 12 skills that are alternatives to Resolving Merge Conflicts in Productivity & Office, each reviewed before publishing.