Merge Conflict Resolution
Use when an authorized Git merge, rebase, cherry-pick, or pull operation has conflicts that must be resolved from primary intent and verified before submission.
Install
npx skills add sandbaseai/workbuddy-skill --skill merge-conflict-resolutiongit clone --depth 1 https://github.com/sandbaseai/workbuddy-skill.git /tmp/workbuddy-skill
mkdir -p ~/.claude/skills
cp -r /tmp/workbuddy-skill/skills/merge-conflict-resolution ~/.claude/skills/merge-conflict-resolutionPersonal skills live in ~/.claude/skills. Use .claude/skills in a project folder to share a skill with your team.
From the SKILL.md
# Merge Conflict Resolution Use this Skill only after the merge, rebase, cherry-pick, or pull operation is authorized and its target is known. The objective is to preserve the intent of compatible changes while producing a coherent, tested history. A conflict is not permission to invent behavior, discard a side silently, or bypass repository protections. ## 1. Establish the exact state From the repository root, inspect the operation in progress, current branch and upstream, `HEAD`, index state, unmerged paths, conflict markers, recent commits, and repository instructions. Record the operation type and the command that started it. Do not run cleanup or reset commands until the affected paths and recoverability are understood. Separate pre-existing user changes from conflict changes. Preserve unrelated work and avoid staging files that are not part of the authorized operation. Never use a broad destructive command against an unresolved worktree. ## 2. Trace primary intent For every conflicted file or hunk, identify both sides' primary sources: commit messages, parent diffs, branch history, linked pull requests or issues when authorized, tests, API/schema contracts, and current domain vocabulary. Prefer the authority that owns the behavior over a later copy in documentation. Build a conflict ledger: | Path/hunk | Ours intent | Theirs intent | Authority/evidence | Resolution | Residual risk | |---|---|---|---|---|---|
Details
- Skill name
merge-conflict-resolution- Repository
- sandbaseai/workbuddy-skill
- Path
skills/merge-conflict-resolution/SKILL.md- License
- MIT
- Repo updated
- 8 September 2026
FAQ
What does the Merge Conflict Resolution skill do?
Use when an authorized Git merge, rebase, cherry-pick, or pull operation has conflicts that must be resolved from primary intent and verified before submission.
How do I install the Merge Conflict Resolution skill?
skills CLI (Claude Code, Cursor, Codex and more): npx skills add sandbaseai/workbuddy-skill --skill merge-conflict-resolution. Skills go in ~/.claude/skills (personal) or .claude/skills (project), and Claude loads them automatically when a task matches the description.
Is Merge Conflict Resolution popular?
It lives in sandbaseai/workbuddy-skill, which has 9 GitHub stars and 3 forks.
Related skills
Access Control Security Best Practices
9sandbaseai/workbuddy-skill
Design, review, implement, and verify least-privilege access controls across users, services, tenants, resources, and administrative workflows.
Accessibility Review
9sandbaseai/workbuddy-skill
Use when reviewing a web interface or interaction for semantic, keyboard, focus, screen-reader, ARIA, and contrast accessibility risks.
Acquire Codebase Knowledge
9sandbaseai/workbuddy-skill
Use when the user asks to map, document, or onboard into an existing codebase and needs evidence-backed architecture, structure, conventions, integrations, testing, and concerns documentation.
Oss Contrib
5Sagargupta16/claude-skills
Use when contributing to open source projects from forked repositories. Handles upstream sync, CONTRIBUTING.md compliance, code style matching, PR preparation, and project-specific patterns. Activates for fork management, PR template filling, and upstream workflow compliance.
Github Research
9sandbaseai/workbuddy-skill
Use when research requires GitHub repositories, source files, specifications, examples, issues, releases, or configuration patterns; choose the right search surface and preserve reproducible source evidence.
Requesting Code Review
9sandbaseai/workbuddy-skill
Use when completing a significant task, implementing a major feature, fixing a complex bug, or preparing changes for integration and need an independent review against explicit requirements.
Browse the most popular Claude skills, all git & code review skills, or write your own with the skills generator.