agentleFS
Sign inStart free
ScinoScino/fstack/skills/fix-merge-conflicts/SKILL.md

fix-merge-conflicts

Skill18 starsChanged 53 days agoMITView on GitHub

Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution

12 other projects use a version of this, 6 of them edited.

Adopted by

Most recently taken up by

Used with

Projects with it also use check-compiler-errors, new-branch-and-pr 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.
  • cogine-aiSkill

    check-compiler-errors

    Run compile and type-check commands and report failures

    Also in 3 projects that use this

  • cogine-aiSkill

    new-branch-and-pr

    Create a fresh branch, complete work, and open a pull request

    Also in 3 projects that use this

  • MicrosoftSkill

    run-smoke-tests

    Run smoke tests to verify extension functionality in a real VS Code environment. Use this when checking if basic features work after changes.

    Also in 3 projects that use this

  • ArthurMor4isSkill

    review-and-ship

    Implement changes, use `/review-bugbot` before pushing, fix critical issues, then handle the full Git + GitHub workflow — branch, commit, push, PR. Use when the user wants to ship with validation, says "review and ship", "ship after review", "run bugbot then push", "review before PR", or asks to implement a feature/fix and submit it only after a Bugbot pass. Prefer this over `ship` when code quality review is expected before the PR goes up.

    Also in 3 projects that use this

  • learnerLjSkill

    verify-this

    Verify a claim with fresh local evidence: restate it falsifiably, capture baseline and treatment, compare artifacts, and return VERIFIED, NOT VERIFIED, or INCONCLUSIVE.

    Also in 3 projects that use this

  • +1 more from cogine-ai

The file

We split this skill into the rules it gives an agent

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

  • 0

    Common

    Most of the 12 edited versions we read keep these.

  • 6

    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:

    Prefer preserving both sides when safe.

    line 17
  2. Distinctive:

    Run compile, lint, and relevant tests.

    line 19
  3. Distinctive:

    Keep changes minimal and readable.

    line 24
  4. Distinctive:

    Do not leave conflict markers in any file.

    line 25
  5. Distinctive:

    Avoid broad refactors while resolving conflicts.

    line 26
  6. Distinctive:

    Do not push or tag during conflict resolution.

    line 27

“Common” is measured: kept by at least 6 in 10 of the 12 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

Fix merge conflicts

Trigger

Branch has unresolved merge conflicts and needs a reliable path to a buildable state.

Workflow

  1. Detect all conflicting files from git status and conflict markers.
  2. Resolve each conflict with minimal, correctness-first edits.
  3. Prefer preserving both sides when safe. Otherwise, choose the variant that compiles and keeps public behavior stable.
  4. Regenerate lockfiles with package manager tools instead of hand-editing.
  5. Run compile, lint, and relevant tests.
  6. Stage resolved files and summarize key decisions.

Guardrails

  • Keep changes minimal and readable.
  • Do not leave conflict markers in any file.
  • Avoid broad refactors while resolving conflicts.
  • Do not push or tag during conflict resolution.

Output

  • Files resolved
  • Notable resolution choices
  • Build/test outcome

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