About resolving-merge-conflicts
resolving-merge-conflicts is a skill for resolving Git merge and rebase conflicts while preserving the intent behind both changes where possible. It directs the workflow from examining conflict context through running project checks and completing the operation.
Key features
- 01Inspects merge or rebase state and conflicts
- 02Traces change intent through commits and issues
- 03Resolves hunks while preserving both intents where possible
- 04Runs project checks and fixes regressions
- 05Stages changes and completes merge or rebase
Use cases
- 01Resolving conflicts during a merge
- 02Working through conflicts in a rebase
- 03Checking that conflict resolution passes project tests
Install
Copy the command and run it in a terminal.
npx skills add https:/After installing, type/resolving-merge-conflictsin Claude Code to confirm it loaded.
Details
From the project README-
See the current state of the merge/rebase. Check git history, and the conflicting files.
-
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.
-
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. -
Discover the project's automated checks and run them — typically typecheck, then tests, then format. If the repository carries an engineer skill (a
<repo>-engineerskill describing how to build, test, and run it), take the commands from there rather than guessing. Fix anything the merge broke. -
Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.
Adapted from mattpocock/skills, MIT © 2026 Matt Pocock. Keep this line if you copy this file.