Git conflict resolve
Skill NSBen/skillfoundry/src/skillfoundry/data/starter_skills/git-conflict-resolve
🔥 SkillFoundry (forge) — open, vendor-neutral toolchain for authoring, validating, testing & publishing AI agent skills. Works across Claude Code / Cursor / Codex / OpenCode / Cline. Ships 15 starter skills.
npx -y skills add NSBen/skillfoundry --skill git-conflict-resolveAssembled from the repository path, not quoted from the project. Check it against their README if it does not work.
2 things to look at
- 15 days oldThe repository was created 15 days ago. New is not bad, but a brand new repository carrying a familiar-sounding name is the shape a typosquat arrives in, and there has been no time for anyone else to find a problem with it.
- 1 stars1 stars. Stars are a popularity signal and not a quality one, but at this level it is likely that nobody has read this closely except its author, and you would be relying on your own review.
What its author says it does
Copied from the file, not written here
Use when a Git merge, rebase, or cherry-pick leaves conflict markers (<<<<<<<, =======, >>>>>>>) and you need to resolve each one correctly, understand both sides, and verify the merged result.
The file declares its own license as MIT. That is the author’s claim about this one file, and it is not the same thing as the license GitHub reports for the repository, which is listed with the other numbers below.
SKILL.md
1.5 KB, 233 tokens by cl100k_base, as published. Nobody here has run it
Git Conflict Resolve
When to use
Invoke this skill whenever git status shows files with conflict markers, or a merge/rebase/cherry-pick stopped because of overlapping changes.
Steps
- List every conflicted file with
git diff --name-only --diff-filter=U. - For each file, read both sides (
<<<<<<< oursvs======= theirs) and the surrounding context. - Decide the resolution: keep ours, keep theirs, or produce a true merge of both intents.
- Remove all conflict markers and ensure the merged block is syntactically valid.
- Run the relevant tests/build, then
git addthe resolved file. - Finish with
git merge --continueorgit rebase --continue.
Examples
- "Merge conflict in utils.py — keep the new error handling but preserve the old logging"
- "This rebase conflict touches imports; tell me what each side changed"
References
Prefer semantic merges over textual ones. When intent overlaps, surface the ambiguity to the user rather than guessing. Never leave a stray <<<<<<< in the tree.
What ships with it
Read from the repository
Just SKILL.md. No reference files, no scripts.