mcpField
R
resolving-merge-conflicts

resolving-merge-conflicts

github.com/timschochDevelopment0382 installsUpdated 1w ago
Repository

About resolving-merge-conflicts

A skill for resolving Git merge and rebase conflicts by tracing the intent behind each change and reconciling conflicting hunks. It also guides users through project checks and completing the merge or rebase.

Key features

  1. 01Inspect merge or rebase state
  2. 02Research change intent and sources
  3. 03Resolve hunks without inventing behavior
  4. 04Run project checks
  5. 05Complete merge or rebase

Use cases

  1. 01Resolve conflicts during a merge
  2. 02Reconcile changes during a rebase
  3. 03Validate the result with project checks

Install

Copy the command and run it in a terminal.

$npx skills add https://github.com/timschoch/mattpocock-skills --skill resolving-merge-conflicts

After installing, type/resolving-merge-conflictsin Claude Code to confirm it loaded.

Bundled filesagents/openai.yaml

Details

From the project README

  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.

Comments

Markdown supported