Stats
Actions
Tags
From mattpocock-skills
Resolves in-progress git merge or rebase conflicts by understanding intent, preserving both sides where possible, and running automated checks.
How this skill is triggered — by the user, by Claude, or both
Slash command
/mattpocock-skills:resolving-merge-conflictsThe summary Claude sees in its skill listing — used to decide when to auto-load this skill
1. **See the current state** of the merge/rebase. Check git history, and the conflicting files.
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. Fix anything the merge broke.
Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.
npx claudepluginhub esonhugh/marketplace --plugin mattpocock-skillsResolves Git merge and rebase conflicts file-by-file using modern tooling. Activates for conflicted merges, rebases, PRs unable to merge, or diverged branches. Supports --ours, --theirs, auto-push.
Resolves Git merge and rebase conflicts efficiently using bulk strategies like `git checkout --theirs/--ours` over manual conflict marker editing. Activates on merge/rebase conflicts.
Resolves Git merge, rebase, cherry-pick, and stash pop conflicts by reading markers, choosing strategies, and safely continuing or aborting.