agentleFS
SantiagoVqzSantiagoVqz/claude-skills/skills/2-build/resolve-conflicts/SKILL.md

resolve-conflicts

Skill2 starsChanged 12 days agoMITView on GitHub

Resolve a git merge or rebase conflict that is in progress, and keep the intent of both sides. Use when a rebase or merge stops on a conflict.

16 other projects use a version of this.

Adopted by

Most recently taken up by

Used with

Projects with it also use worktrees, diagram and 4 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.
  • nilecuiSkill

    worktrees

    Guide for using git worktrees to parallelize development with coding agents. Use this skill when the user requests to work in a new worktree or wants to work on a separate feature in isolation (e.g., "Work in a new worktree", "Create a worktree for feature X").

    Also in 3 projects that use this

  • johnlindquistSkill

    diagram

    Maintain and synchronize Unified Impact Diagrams following Diagram Driven Development (DDD) methodology. Create, update, and manage diagrams that connect user value to technical implementation.

    Also in 3 projects that use this

  • nicolasestremSkill

    document

    Create focused documentation for specific components or features

    Also in 3 projects that use this

  • sunnyclinches44Skill

    explain

    Explains code using real-world analogies and ASCII diagrams

    Also in 4 projects that use this

  • BlockSkill

    plan

    Draft a TDD, PRD, or lightweight plan in the conversation without committing it.

    Also in 5 projects that use this

  • GoogleSkill

    wayfinder

    Plan a huge chunk of work — more than one agent session can hold — as a shared map of decision tickets on your issue tracker, and resolve them one at a time until the way to the destination is clear.

    Also in 3 projects that use this

The file

We split this skill into the rules it gives an agent

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

  • 0

    Common

    Most of the 16 edited versions we read keep these.

  • 3

    Distinctive

    This author's own choices. Worth a look.

  • 0

    Very specific

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

  • Common
  • Distinctive
  • Very specific
  1. Distinctive:

    Run git status to get the conflicted files, and to see whether a rebase or a merge is in progress.

    line 18
  2. Distinctive:

    When both sides change the same behavior in different ways, both intents cannot work.

    line 32
  3. Distinctive:

    Run the checks of the repo: the typecheck, the tests, the lint and the build.

    line 38

“Common” is measured: kept by at least 6 in 10 of the 16 edited versions of this file we could read. “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

Resolve conflicts

A conflict has two intents, one for each side. Each side was made for a reason, and the resolution keeps both reasons.

1. See the state

Run git status to get the conflicted files, and to see whether a rebase or a merge is in progress. Read the commits of each side with git log.

Completion: you know each conflicted file and the commits on each side.

2. Find the intents

For each side, read its commit messages and the ticket or issue that they name, with its acceptance criteria. Write each intent in one sentence.

Completion: each conflict has two intents, one sentence each.

3. Resolve

Resolve each hunk so that both intents work. Add no behavior that neither side asked for. When the code of one side replaces the code of the other side, keep each check and each error that the replaced code had.

When both sides change the same behavior in different ways, both intents cannot work. Do not pick one. Ask the user with the question tool, with one option for each side. Each option shows its intent and its ticket in one line.

Completion: no file has conflict markers, and each hunk keeps both intents or follows the user's choice.

4. Check

Run the checks of the repo: the typecheck, the tests, the lint and the build. Fix what the resolution broke.

Completion: every check passes.

5. Finish

Stage the files and continue: git rebase --continue, or commit the merge. Continue until the rebase has applied every commit. Each new conflict starts again at step 1.

Completion: git status shows no rebase and no merge in progress.

Report

Each conflicted file · the two intents · how you resolved it · the user's choices.

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.