Agent skill · software engineering · aiskillstore
resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
Why this skill is useful
Codifies a specific procedure for resolving merge conflicts that the AI could infer but now doesn't have to guess.
What it needs
About 1k tokens when loaded. Last updated 2026-08-07. 405 stars on the source repository.
What this skill does
1. See the current state of the merge/rebase. Check git history, and the conflicting files. 2. Find the primary sources for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets. 3. Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do not invent new behaviour. Always resolve; never --abort. 4. Discover the project's automated checks and run them — typically typecheck, then tests, then format. Fix anything the merge broke. 5. Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.
How to use it
Reference it in AdaL, Claude Code, Cursor or any coding agent — nothing to install:
@skills aiskillstore/resolving-merge-conflicts