Resolving Merge Conflicts alternatives

12 skills that do a similar job to Resolving Merge Conflicts in Productivity & Office, ranked by rating and usage.

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…678,622+

skillclaude_appclaude_codeclaude_api

npx skills add mattpocock/skills

Implement

Implement a piece of work based on a spec or set of tickets.628,456+

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…580,246+

skillclaude_appclaude_codeclaude_api

git clone https://github.com/openai/skills && cp -r skills/skills/.curated/gh-fix-ci ~/.claude/skills/

Gh Fix CI

Use when a user asks to debug or fix failing GitHub PR checks that run in GitHub Actions; use `gh` to inspect checks and logs, summarize failure conte…0+

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 mattpocock/skills

Domain Modeling

Build and sharpen a project's domain model. Use when discussing codebase terminology, writing or editing a CONTEXT.md, or recording or editing an ADR.715,241+

skillclaude_appclaude_codeclaude_api

git clone https://github.com/openai/skills && cp -r skills/skills/.curated/gh-address-comments ~/.claude/skills/

Gh Address Comments

Help address review/issue comments on the open GitHub PR for the current branch using gh CLI; verify gh auth first and prompt the user to authenticate…0+

skillclaude_appclaude_codeclaude_api

npx skills add mattpocock/skills

Setup Pre Commit

Set up Husky pre-commit hooks with lint-staged (Prettier), type checking, and tests in the current repo. Use when user wants to add pre-commit hooks,…399,664+

skillclaude_appclaude_codeclaude_api

npx skills add mattpocock/skills

Research

Investigate a question against high-trust primary sources and capture the findings as a Markdown file in the repo. Use when the user wants a topic res…576,164+

skillclaude_appclaude_codeclaude_api

npx skills add mattpocock/skills

Prototype

Build a throwaway prototype to answer a design question. Use when the user wants to sanity-check whether a state model or logic feels right, or explor…853,069+

skillclaude_appclaude_codeclaude_api

npx skills add mattpocock/skills

Improve Codebase Architecture

Scan a codebase for deepening opportunities, present them as a visual HTML report, then grill through whichever one you pick.1,008,430+

skillclaude_appclaude_codeclaude_api

git clone https://github.com/anthropics/knowledge-work-plugins && cp -r knowledge-work-plugins/engineering/skills/debug ~/.claude/skills/

Debug

Structured debugging session — reproduce, isolate, diagnose, and fix. Trigger with an error message or stack trace, "this works in staging but not pro…★ 4.8 · 0+

Frequently asked questions

What is the best alternative to Resolving Merge Conflicts?

Ranked by rating and usage on AI Khazna, the top alternative is Diagnosing Bugs. Diagnosis loop for hard bugs and performance regressions. Use when the user says "diagnose"/"debug this", or reports something broken/throwing/failing/slow.

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.