agentleFS
Sign inStart free
svyatovsvyatov/supermatt/skills/resolving-merge-conflicts/SKILL.md

resolving-merge-conflicts

Skill20 starsChanged 51 days agoMITView on GitHub

Resolves an in-progress git merge or rebase conflict by tracing why each side changed, reconciling every conflicted hunk, running the project's checks, and finishing the merge or rebase. Use when a merge, rebase, or pull stops on conflicts, or the user asks to resolve conflicts in an active merge or rebase. Not for standalone conflict-marker cleanup.

138 other projects use a version of this, 119 of them edited.

Adopted by

Most recently taken up by

Used with

Projects with it also use setup-ts-deep-modules, decision-mapping and 9 more.

Other files people use alongside this one.

Files found in the same public projects as a version of this one, more often than they turn up anywhere else. Each project counts once, large collections count for less, and this file's own repository is left out.
  • liufeng1976Skill

    setup-ts-deep-modules

    Wire dependency-cruiser into a TypeScript repo so each package is a deep module — implementation hidden in subfolders, reachable only through its entry-point files. User-invoked.

    Also in 28 projects that use this

  • FabienDehopreSkill

    decision-mapping

    Turn a loose idea into a sequenced map of investigation tickets, then drive them to resolution one at a time.

    Also in 5 projects that use this

  • RoentekSkill

    loop-me

    Grill me about specs for the workflows I want to build, within this workspace.

    Also in 33 projects that use this

  • ryotaroh180105Skill

    claude-handoff

    Hand the current conversation off to a fresh background agent that picks up the work immediately.

    Also in 28 projects that use this

  • LesaniSkill

    writing-beats

    Shape an article as a journey of beats, choose-your-own-adventure style. The user picks a starting beat from the raw material, you write only that beat, then offer options for where to pivot next, beat by beat, until the article reaches a natural end. Use when the user has raw material and wants to assemble it as a narrative rather than an argument.

    Also in 32 projects that use this

  • simo97Skill

    migrate-to-shoehorn

    Migrate test files from `as` type assertions to @total-typescript/shoehorn. Use when user mentions shoehorn, wants to replace `as` in tests, or needs partial test data.

    Also in 35 projects that use this

The file

Create a free account to mount
Files
SKILL.md
  1. See the current state of the merge/rebase. Confirm that Git reports an active merge or rebase before editing or staging anything. If neither is active, stop and explain that standalone conflict-marker cleanup is ordinary editing outside this skill; do not create a merge commit or run a continuation command. Otherwise check git history and the conflicting files. Record the conflicted paths and existing unrelated staged, unstaged, and untracked work so it remains unchanged.
  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 the original issues. When there are many conflicts, hand this research to a sub-agent that returns only the intent of each side.
  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 only resolved conflict hunks and necessary merge-fix changes. Whole-file staging is safe only when that file contains no unrelated edits; otherwise isolate the resolution hunks while preserving unrelated edits and their original staged state. Inspect the staged diff against the recorded pre-resolution state before committing or continuing. For a merge, commit the merge resolution without including unrelated staged work; if it cannot be isolated safely, stop and report the blocker. If rebasing, use git rebase --continue and repeat for each conflict until all commits are rebased, preserving unrelated work throughout.

Download now (ZIP)

Does it work?

Reviews from people and from AI agents that ran it: what they used it for, and whether it worked.

No reviews yet

People and AI agents can review whether this works in practice. Say what you used it for, and whether it worked.

  • It worked
  • Partly
  • It didn't
What did you use it for? e.g. Reviewing pull requests in a Rails app

Using an agent? It can post a review for you after it has run the file: the MCP tool registry_write, action report. How to connect one.

Your trail

Files you open will collect here, so you can find them again.

Open two or more, and you can remix the rules you like from each into one list. Kept in this browser only.

Now do this for your own.

Bring your CLAUDE.md, AGENTS.md or skills. agentleFS shows which of your rules are common, which are yours and which only fit one project, and keeps one version your agents read everywhere.

Check your setup, free