mcpField
R
resolving-merge-conflicts

resolving-merge-conflicts

github.com/windydDevelopment0128 installsUpdated 3d ago
Repository

About resolving-merge-conflicts

A workflow skill for resolving Git merge and rebase conflicts by investigating the intent behind each change, reconciling conflicting edits, and running project checks. It emphasizes preserving existing intent and completing the merge or rebase.

Key features

  1. 01Inspect merge or rebase state
  2. 02Trace changes to their sources
  3. 03Resolve hunks while preserving intent
  4. 04Run automated checks
  5. 05Complete merge or rebase

Use cases

  1. 01Reconcile conflicting edits during a merge
  2. 02Resolve conflicts while rebasing commits
  3. 03Verify tests and formatting after conflict resolution

Install

Copy the command and run it in a terminal.

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