agentleFS
Sign inStart free
moah0911moah0911/aftermath/skills/merge-conflict/SKILL.md

merge-conflict

Skill14 starsChanged 6 days agoMITView on GitHub

Use when a merge, rebase, or cherry-pick stops on conflicts. Read both sides, never blindly take ours or theirs, never reset/abort to escape, and run the affected tests after resolving.

  • Deletes or force-pushes

1 other project uses a version of this.

Adopted by

Most recently taken up by

  • Other versions1 project uses a version of this.

    Word for word · 0

    None found.

    Edited · 0

    None found.

    Wrote their own version · 1

    1. KhaledSaeed18/dotclaude★ 5same name

    How matches are found. Word for word: the exact same text. Edited: shares passages with this file (“99% same” means 99% of its five-word phrases also appear here; 10% or more counts). Their own version: similar meaning, or, weakest, the same name. We can’t tell which project had it first. Projects are counted among the 200 most-starred candidates, and mentions are links to the repository we found, up to 50 per site, so both counts are a floor.

  • In this repository9 other files it gives its agents.

The file

We split this skill into the rules it gives an agent

8 rules. About 0 are common, 5 are distinctive, and 3 are very specific to this project.

  • ≈0

    Common · estimate

    Many files like this have a rule of this kind.

  • ≈5

    Distinctive · estimate

    This author's own choices. Worth a look.

  • 3

    Very specific

    Tied to their project's names, files or tools. Probably skip.

  • Common
  • Distinctive
  • Very specific
  1. Distinctive:

    Stop. Run git status --short and list every unmerged path.

    line 16
  2. Very specific:

    Read the conflict markers in each file: <<<<<<< (current side), =======, >>>>>>> (incoming side).

    line 17
  3. Very specific:

    Remove every conflict marker.

    line 20
  4. Distinctive:

    Run the affected tests, then the broader suite.

    line 21
  5. Very specific:

    Never blindly take --ours or --theirs for a whole file.

    line 26
  6. Distinctive:

    Never git reset --hard, git merge --abort, or git rebase --abort just to escape.

    line 27
  7. Distinctive:

    Never commit with conflict markers or with a half-run test suite.

    line 28
  8. Distinctive:

    Never mix the conflict resolution with unrelated edits.

    line 29

≈ “Common” is an estimate: at least 1 in 5 of the 350,495 skill files we read have a rule of the same kind, not the same words. “Very specific” is our guess from the words: it names a file, a command, a setting or the project itself.

Keep what fits and drop the rest. Your version, ready for your agents.
Files
SKILL.md

Merge Conflict

A conflict is two intents colliding. Resolving it means understanding both, not picking a side quickly.

Steps

  1. Stop. Run git status --short and list every unmerged path.
  2. Read the conflict markers in each file: <<<<<<< (current side), =======, >>>>>>> (incoming side). Read the surrounding code, not just the marked lines.
  3. State the two intents in one line each. If you cannot, you are not ready to resolve.
  4. Resolve the smallest region that satisfies both intents. Keep unrelated formatting out of the resolution.
  5. Remove every conflict marker. Search the tree for <<<<<<<, =======, >>>>>>>.
  6. Run the affected tests, then the broader suite. A clean git status is not proof of correctness.
  7. Stage only the resolved files. Never git add -A during a conflict.

Never

  • Never blindly take --ours or --theirs for a whole file.
  • Never git reset --hard, git merge --abort, or git rebase --abort just to escape; those discard state. Confirm with the user if abandoning is truly intended.
  • Never commit with conflict markers or with a half-run test suite.
  • Never mix the conflict resolution with unrelated edits.

Checkpoints

Checkpoint auto-revert covers test green→red edits, not merges. Resolve conflicts deliberately; do not expect a restore to rescue a bad resolution.

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