Menu
Use when you need to resolve an in-progress git merge/rebase conflict.
The review-first prompt is selected by default. You can switch to a direct command or download a local copy.
Read SKILL.md and any companion files shown by SkillsMP before deciding whether to install.
Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.
A direct command skips the review prompt. Inspect the source before running it.
npx skills add https://github.com/jackfranklin/dotfiles --skill resolve-merge-conflictThe command stays on one line. Scroll horizontally to inspect it before copying.
Prefer a local copy? Download the files currently available to SkillsMP.
Collaboratively discuss designs, evaluate trade-offs, and explore alternative implementation approaches. Starts from the simplest viable option and explores justified alternatives without fixed personas.
Implements an approved code-change plan safely. Use when beginning a feature, bug fix, or refactor that requires source changes, tests, a dedicated branch, small logical commits, and a GitHub pull request when applicable.
Write a right-sized, no-placeholder implementation plan as a series of focused tasks, with exact file paths, implementation details, proportionate test steps, and commit instructions. Performs a pre-planning preflight investigation and Ponytail decision ladder checks before drafting the plan. Reviews the plan with the user task by task before storing an explicitly approved plan on the relevant GitHub issue.
Based on SOC occupation classification
Showing SKILL.md
| disable-model-invocation | true |
| name | resolve-merge-conflict |
| description | Use when you need to resolve an in-progress git merge/rebase conflict. |
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. If you are unsure of the correct resolution, stop and ask the user for clarification.
Verify conflict markers. Before staging any resolved file, explicitly search it to ensure all conflict markers (<<<<<<<, =======, >>>>>>>) have been removed.
Discover the project's automated checks and run them. Build the project first, then run typecheck, tests, and 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.
