mcpField
R
resolving-merge-conflicts

resolving-merge-conflicts

github.com/nstaab1Development043 installsUpdated 3w ago
Repository

About resolving-merge-conflicts

A skill for developers and coding agents resolving Git merge or rebase conflicts. It emphasizes tracing the intent behind changes, preserving both sides where possible, and running project checks.

Key features

  1. 01Inspect merge or rebase state
  2. 02Trace the origins of conflicting changes
  3. 03Resolve hunks according to intent
  4. 04Run typechecks, tests, and formatting
  5. 05Finish merges or continue rebases

Use cases

  1. 01Resolve file conflicts in a merge
  2. 02Work through code conflicts during a rebase

Install

Copy the command and run it in a terminal.

$npx skills add https://github.com/nstaab1/nathan-agent-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