How do I install the Workflow Merge Conflicts skill?

Run npx skillmds@latest add kensaurus/workflow-merge-conflicts in your terminal (requires Node.js), paste this page's agent-chat prompt into Claude, Cursor, or any MCP-connected agent, or download the SKILL.md file and copy it into your agent's skills directory.

Is Workflow Merge Conflicts safe to use?

This skill has not completed SkillMD's automated safety review yet. SkillMD never runs a skill's scripts for you; review the SKILL.md before installing.

Which AI agents work with Workflow Merge Conflicts?

This skill is tagged as working with Claude Code, Claude.ai, OpenAI Codex. SKILL.md is an open format, so most agents that read a skills directory can load it too.

Is Workflow Merge Conflicts free to use?

Yes. Installing skills from SkillMD is free. This skill is licensed under MIT.

Who published Workflow Merge Conflicts?

kensaurus (@kensaurus) published this skill. Their other Agent Skills are listed on their SkillMD profile.

Workflow Merge Conflicts by kensaurus

Name: Workflow Merge Conflicts
Author: kensaurus

Workflow Merge Conflicts

Resolve an in-progress git merge or rebase conflict by tracing each side back to its original intent. Use when the user says "resolve the conflicts", "fix this merge", "the rebase is stuck", or a pull/merge/rebase has left conflict markers in the tree.

kensaurus Updated Sep 21, 2026 8 repo stars

File contents

Resolving Merge Conflicts

Degree of freedom: MIXED. Which intent wins [HIGH freedom]; inspect, never --abort unasked, and run real checks [LOW freedom — run exactly].

Adapted from mattpocock/skills (MIT).

How to reason

Identify — operation (merge/rebase/cherry-pick) and conflicted files
Intent — why each side changed, from commits/PRs — not the markers
Preserve — both intents if possible; else the merge's stated goal
Verify — typecheck + tests + lint; then finish the operation

Worked example

Identify: rebase of fix/cart-sku onto main; conflict in src/lib/cart.ts. Intent: this branch treats missing SKU as invalid; main extracted quoteCart to a new file. Preserve: keep the extraction and the missing-SKU branch — move the guard into quoteCart. Verify: pnpm typecheck && pnpm test green; git rebase --continue; tree clean.

Self-critique before reporting

Intent, not text — no "ours/theirs" from appearance alone
No invented behavior — resolution does not add a third design
Checks run — semantic conflicts caught after a clean text merge
Right owner — message after resolve → workflow-git-commit; open PR lifecycle → workflow-pr

See the current state. [LOW freedom — run exactly] git status for the operation in progress (merge/rebase/cherry-pick) and the conflicting files; git log --oneline --left-right HEAD...MERGE_HEAD (or the rebase equivalent) for what each side contains.
Find the primary sources for each conflict. [HIGH freedom] Understand deeply why each change was made and what the original intent was: read the commit messages, check the PRs, check the original issues or tickets. Never resolve a hunk on textual appearance alone.
Resolve each hunk. [HIGH freedom] Preserve both intents where possible. Where they are incompatible, pick the one matching the merge's stated goal and note the trade-off. Do not invent new behavior. Always resolve; never --abort without the user's explicit instruction.
Run the project's automated checks [LOW freedom — run exactly] — typecheck, then tests, then format/lint, using the repo's real scripts. Fix anything the merge broke; conflicts that merge cleanly at the text level can still conflict semantically.
Finish the operation. [LOW freedom — run exactly] Stage everything and commit (or git rebase --continue until all commits are replayed). Confirm the tree is clean and checks are green before reporting done.

Related: workflow-git-commit, workflow-pr, verification-before-completion.

---name: workflow-merge-conflictsdescription: Resolve an in-progress git merge or rebase conflict by tracing each side back to its original intent. Use when the user says "resolve the conflicts", "fix this merge", "the rebase is stuck", or a pull/merge/rebase has left conflict markers in the tree.license: MIT---# Resolving Merge Conflicts**Degree of freedom: MIXED.** Which intent wins `[HIGH freedom]`; inspect,never `--abort` unasked, and run real checks `[LOW freedom — run exactly]`.> Adapted from [mattpocock/skills](https://github.com/mattpocock/skills) (MIT).## How to reason1. **Identify** — operation (merge/rebase/cherry-pick) and conflicted files2. **Intent** — why each side changed, from commits/PRs — not the markers3. **Preserve** — both intents if possible; else the merge's stated goal4. **Verify** — typecheck + tests + lint; then finish the operation## Worked example> **Identify:** rebase of `fix/cart-sku` onto `main`; conflict in `src/lib/cart.ts`.> **Intent:** this branch treats missing SKU as invalid; main extracted `quoteCart` to a new file.> **Preserve:** keep the extraction and the missing-SKU branch — move the guard into `quoteCart`.> **Verify:** `pnpm typecheck && pnpm test` green; `git rebase --continue`; tree clean.## Self-critique before reporting- **Intent, not text** — no "ours/theirs" from appearance alone- **No invented behavior** — resolution does not add a third design- **Checks run** — semantic conflicts caught after a clean text merge- **Right owner** — message after resolve → `workflow-git-commit`; open PR lifecycle → `workflow-pr`1. **See the current state.** `[LOW freedom — run exactly]` `git status` for the operation in progress (merge/rebase/cherry-pick) and the conflicting files; `git log --oneline --left-right HEAD...MERGE_HEAD` (or the rebase equivalent) for what each side contains.2. **Find the primary sources for each conflict.** `[HIGH freedom]` Understand deeply why each change was made and what the original intent was: read the commit messages, check the PRs, check the original issues or tickets. Never resolve a hunk on textual appearance alone.3. **Resolve each hunk.** `[HIGH freedom]` Preserve both intents where possible. Where they are incompatible, pick the one matching the merge's stated goal and note the trade-off. Do **not** invent new behavior. Always resolve; never `--abort` without the user's explicit instruction.4. **Run the project's automated checks** `[LOW freedom — run exactly]` — typecheck, then tests, then format/lint, using the repo's real scripts. Fix anything the merge broke; conflicts that merge cleanly at the text level can still conflict semantically.5. **Finish the operation.** `[LOW freedom — run exactly]` Stage everything and commit (or `git rebase --continue` until all commits are replayed). Confirm the tree is clean and checks are green before reporting done.**Related:** `workflow-git-commit`, `workflow-pr`, `verification-before-completion`.

Frequently asked questions