Merge conflict resolution
Skill kimtth/agent-skill-100-lines-or-less/skills/merge-conflict-resolution
🧿 Minimal but effective AI agent skill definitions in 100 lines or less.
npx -y skills add kimtth/agent-skill-100-lines-or-less --skill merge-conflict-resolutionAssembled from the repository path, not quoted from the project. Check it against their README if it does not work.
2 things to look at
- no licenseNo license file was found in the repository. Code published without one is not open source by default, so using it at work is a question for whoever answers licensing questions where you are.
- 2 stars2 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: resolve git merge or rebase conflicts correctly without losing intended changes.
SKILL.md
1.1 KB, 211 tokens by cl100k_base, as published. Nobody here has run it
Goal: a merged result that keeps both sides' intent and still works.
Use for:
- resolving conflicts during merge, rebase, or cherry-pick
- understanding which changes to keep and why
- recovering from a confusing conflicted state
Workflow:
- Understand both sides before editing: what each change intended.
- Open each conflicted file; read the full surrounding context.
- Combine intents; do not blindly pick one side.
- Remove all conflict markers and reconcile the logic.
- Build and run tests before completing the merge.
- Review the final diff against both parents.
Tactics:
- use a three-way merge tool for complex conflicts
- resolve in small logical chunks
- re-run the feature's tests, not just compile
- when lost, abort and restart with a clearer plan
Rules:
- never keep conflict markers in committed code
- do not discard a side without understanding it
- verify behavior after resolving, not just syntax
- prefer git merge --abort over guessing when unsure