resolve-m-conflicts

From README

Resolve Merge Conflicts Guide the developer through merge conflicts one at a time, with full context and clear choices. The goal is not just to resolve conflicts — it's to help the developer make an informed decision about each one. --- Step 1: Discover Conflicts Run git diff --name-only --diff-filter=U to find all files with unmerged paths. If no conflicts exist, tell the developer and stop. Present a summary: Found N conflicts across M files: file1.ts, file2.ts, ... Then work through them one file at a time, one conflict hunk at a time. --- Step 2: Parse Each Conflict For each conflict hunk (bounded by >>>>>>), extract: Ours (HEAD / current branch) — the code above ======= Theirs (incoming branch) — the code below ======= Surrounding context — 5-10 lines above and below the conflict markers to show where in the file this sits --- Step 3: Build Context — Why Did This Conflict Happen? This is what makes the resolution informed rather than a coin flip.