agentsclimarketplace
Sign in

Git conflict resolve

Skill NSBen/skillfoundry/src/skillfoundry/data/starter_skills/git-conflict-resolve

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.From its SKILL.md

Install
npx -y skills add NSBen/skillfoundry --skill git-conflict-resolve

Assembled from the repository path, not quoted from the project. Check it against their README if it does not work.

One thing to look at

  • 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 file declares

Copied from the file, not written here

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

  1. List every conflicted file with git diff --name-only --diff-filter=U.
  2. For each file, read both sides (<<<<<<< ours vs ======= theirs) and the surrounding context.
  3. Decide the resolution: keep ours, keep theirs, or produce a true merge of both intents.
  4. Remove all conflict markers and ensure the merged block is syntactically valid.
  5. Run the relevant tests/build, then git add the resolved file.
  6. Finish with git merge --continue or git 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.

Keep looking

Skills are one crate of 325,949. Ordering is by how many stacks a row turns up in, so the top of any crate is what has actually been picked rather than what has the most stars.