mcpField
L
light-merge-conflicts

light-merge-conflicts

github.com/light-chengDevelopment57 installsUpdated 3d ago
Repository

About light-merge-conflicts

light-merge-conflicts is a workflow skill for resolving Git merge and rebase conflicts. It guides developers through tracing change intent, resolving hunks, running project checks, and completing the operation.

Key features

  1. 01Inspect merge or rebase state
  2. 02Trace conflict origins and intent
  3. 03Resolve hunks without inventing behavior
  4. 04Run automated project checks
  5. 05Complete merge or rebase

Use cases

  1. 01Resolving conflicts during a Git merge
  2. 02Handling conflicts while rebasing commits
  3. 03Checking for regressions after conflict resolution

Install

Copy the command and run it in a terminal.

$npx skills add https://github.com/light-cheng/skills --skill light-merge-conflicts

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

Bundled filesagents/openai.yamlATTRIBUTION.md

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