agentsclimarketplace

Git conflict resolution

Skill shinzoxD/knackbox/skills/coding/git-conflict-resolution

Curated, auditable, benchmark-ready Agent Skills library for Claude Code, Codex, OpenCode, Cursor, and more.

Install
npx -y skills add shinzoxD/knackbox --skill git-conflict-resolution

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

2 things to look at

  • 29 days oldThe repository was created 29 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.
  • 0 stars0 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

Resolve git merge and rebase conflicts carefully while preserving intent. Use whenever the user has merge conflicts, rebase conflicts, or asks how to untangle conflicting branches, conflict markers, or conflicting file hunks.

The file declares its own license as Apache-2.0. 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.9 KB, 346 tokens by cl100k_base, as published. Nobody here has run it

Git Conflict Resolution

Resolve conflicts by understanding both sides, not by blindly keeping "ours" or "theirs". Prefer a working tree that builds and preserves intentional behavior from each branch.

Workflow

  1. Identify conflict type: merge, rebase, cherry-pick, or stash pop.
  2. List conflicted files. Prioritize build/config, then core logic, then docs.
  3. For each file, restate what each side intended from the hunks and context.
  4. Produce a resolved version. Remove all conflict markers.
  5. Verify with build/tests when available; stage and continue the operation.
  6. If both sides are valid but incompatible product-wise, stop and ask.

Output format

## Conflict plan
**Operation:** merge | rebase | …
**Files:** …

### path/to/file
- **Ours intent:** …
- **Theirs intent:** …
- **Resolution:** …
- **Snippet or steps:** …

### Commands
```bash
# status / add / continue / abort


## Rules

1. Never leave conflict markers in the final suggestion.
2. Do not invent code that was not shown; mark assumptions.
3. Prefer regenerating lockfiles over hand-merging when safe.
4. Avoid drive-by refactors while resolving.
5. Offer abort when risk of data loss or confusion is high.
6. Binary files: choose a side explicitly.

## Edge cases

- **Rebase:** conflicts may repeat per commit; resolve toward the new base carefully.
- **Modify/delete:** confirm whether the file should exist.
- **Semantic conflict without markers:** call out API/behavior divergence.

What ships with it: 1 file

1.5 KB alongside SKILL.md

benchmarks/

Keep looking

Skills are one crate of 327,132. 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.