resolving-merge-conflictslisted

# resolving-merge-conflicts Resolves an in-progress `git rebase` or `git merge` that stopped on conflicts. **Most derived-artifact conflicts never reach this skill any more (ADR-0024, PR-3).** `docs/reference/catalog.json`, `docs/reference/symbol-map.json`, and `pnpm-lock.yaml` are tagged `merge=m3l-generated` in `.gitattributes`; git's registered custom driver (`bin/merge-driver-generated.mjs`) auto-resolves any conflict on them by keeping the current side and exiting 0 — no stop, no manual step — and the `post-rewrite`/`post-merge` lefthook hook (`bin/post-integrate-regen.mjs`) regenerates them immediately afterward, reporting dirty files for a `docs: reconcile doc metadata` commit. If the driver is unregistered (a fresh clone before `pnpm install`), git falls back to a normal conflict on these files and they land in Step 3's table below like everything else. What's left for this skill: real `src/**`/`tests/**` logic conflicts (always **handed back** — the skill aborts and tells the user to resolve manually, so it never mechanically picks a stale side and reintroduces a banned pattern that a PreToolUse hook would then block), same-_module_ `*.provenance.json` sidecar conflicts (genuine parallel work on one module, not driver-covered), the `package.json` `dependencies` block (not driver-covered — `pnpm-lock.yaml` is, but the source-of-truth block itself still needs a union), and a same-_row_ collision in the hand-edited trackers (two branches touching the identical table