Resolve Git merge, rebase, cherry-pick, revert, and stash conflicts safely by understanding both sides and the operation in progress before integrating, then verifying the result builds and passes tests. Use when a merge/rebase/cherry-pick stops with conflicts or "needs merge".
How to install merge-conflict?
khaledsaeed18/dotclaude/merge-conflict
$npx -y skills add khaledsaeed18/dotclaude --skill merge-conflictInstalls into the current project.
›Prefer a prompt? Paste this to your agent
Run `npx skills use "https://github.com/khaledsaeed18/dotclaude" --skill "khaledsaeed18/dotclaude/merge-conflict"` and follow the generated skill instructions now. Read its complete output, redirecting it to a temporary file first if necessary. Resolve relative paths from the supporting-files directory it provides.
Use the skills in "https://github.com/khaledsaeed18/dotclaude" that are relevant to the current task. Run `npx skills add "https://github.com/khaledsaeed18/dotclaude"` and select the relevant skills, then follow their instructions.
Related
6 picksType
- setup-matt-pocock-skillsConfigure this repo for the engineering skills — set up its issue tracker, triage label vocabulary, and domain doc layout.Jul 2026
- microsoft-foundryDeploy, evaluate, fine-tune, and manage Foundry agents end-to-end with azd: hosted agent scaffold/run/deploy, prompt agent create, batch eval, continuous eval,…Jul 2026
- azure-deployExecute Azure deployments for ALREADY-PREPARED applications that have existing .azure/deployment-plan.md and infrastructure files.Jul 2026
- azure-preparePrepare azd-based Azure projects for deployment: generates azure.yaml, infrastructure (Bicep/Terraform), and Dockerfiles for the Azure Developer CLI (azd)…Jul 2026
- azure-validatePre-deployment validation for Azure readiness. Run deep checks on configuration, infrastructure (Bicep or Terraform), RBAC role assignments, managed identity…Jul 2026
- azure-aigatewayConfigure Azure API Management as an AI Gateway for AI models, MCP tools, and agents.Jul 2026
