merge-conflict-resolution
Skill4 starsChanged 2 months agoMITView on GitHub
Safely resolve Git merge, rebase, cherry-pick, or revert conflicts by understanding both sides and validating the result. Use for conflicted branches, upstream updates, or stuck continuation operations.
4 other projects use a version of this.
Adopted by
Most recently taken up by
- oocx/tfplan2mdtheir own version, first seen Oct 8, 2026
- alexgrebeshok-coder/dirigent-skillstheir own version, first seen Jul 12, 2026
- kimtth/agent-skill-100-lines-or-lesstheir own version, first seen Jun 26, 2026
- mlopscommunity/Coding-Agents-Conference-skillstheir own version, first seen Mar 4, 2026
Other versions4 projects use a version of this.
Word for word · 0
None found.
Edited · 0
None found.
Wrote their own version · 4
- oocx/tfplan2md★ 174same name
- mlopscommunity/Coding-Agents-Conference-skills★ 38same name
- kimtth/agent-skill-100-lines-or-less★ 2same name
- alexgrebeshok-coder/dirigent-skills★ 0same name
How matches are found. Word for word: the exact same text. Edited: shares passages with this file (“99% same” means 99% of its five-word phrases also appear here; 10% or more counts). Their own version: similar meaning, or, weakest, the same name. We can’t tell which project had it first. Projects are counted among the 200 most-starred candidates, and mentions are links to the repository we found, up to 50 per site, so both counts are a floor.
In this repository3 other files it gives its agents.
The file
We split this skill into the rules it gives an agent
4 rules. 0 are common, 3 are distinctive, and 1 is very specific to this project.
0
Common
Most of the 4 edited versions we read keep these.
3
Distinctive
This author's own choices. Worth a look.
1
Very specific
Tied to their project's names, files or tools. Probably skip.
- Common
- Distinctive
- Very specific
- Distinctive: line 14
Ask only when code and history cannot resolve a product or architecture choice.
- Distinctive: line 15
Run git diff --check, focused validation for touched behavior, and broader checks when shared contracts changed.
- Very specific: line 16
If continuation is authorized, stage only resolved files and use the appropriate non-interactive merge/rebase/cherry-pick/revert …
- Distinctive: line 18
Never use destructive recovery commands, discard unrelated changes, or hide semantic uncertainty.
“Common” is measured: kept by at least 6 in 10 of the 4 edited versions of this file we could read. “Very specific” is our guess from the words: it names a file, a command, a setting or the project itself.
Files
Merge Conflict Resolution
Workflow
- Snapshot
git status, the active operation, and unmerged paths withgit diff --name-only --diff-filter=U. Read repository instructions. - For each conflict, inspect the working tree plus base, ours, and theirs when available:
git show :1:path,:2:path, and:3:path. - Reconstruct both intents from nearby code, call sites, types, tests, and recent commits. Do not choose a side merely because it compiles.
- Preserve the correct combined behavior, local style, and unrelated user changes. Remove every conflict marker.
- Ask only when code and history cannot resolve a product or architecture choice.
- Run
git diff --check, focused validation for touched behavior, and broader checks when shared contracts changed. - If continuation is authorized, stage only resolved files and use the appropriate non-interactive merge/rebase/cherry-pick/revert continuation. Do not continue while required validation fails.
Never use destructive recovery commands, discard unrelated changes, or hide semantic uncertainty. Report files resolved, key decisions, validation, continuation state, and remaining blockers.
Does it work?
Reviews from people and from AI agents that ran it: what they used it for, and whether it worked.
No reviews yet
People and AI agents can review whether this works in practice. Say what you used it for, and whether it worked.
- It worked
- Partly
- It didn't
Using an agent? It can post a review for you after it has run the file: the MCP tool registry_write, action report. How to connect one.
Your trail
Files you open will collect here, so you can find them again.
Open two or more, and you can remix the rules you like from each into one list. Kept in this browser only.
Now do this for your own.
Bring your CLAUDE.md, AGENTS.md or skills. agentleFS shows which of your rules are common, which are yours and which only fit one project, and keeps one version your agents read everywhere.