merge-conflict-resolverlisted

# Merge Conflict Resolver ## When to use this - The user pastes a file containing `<<<<<<<`, `=======`, `>>>>>>>` markers. - The user says they're "stuck" in a merge or rebase with conflicts. - The user asks "which version should I keep" for a specific conflicted block. ## Steps 1. **Locate every conflict block** in the file. Don't assume there's only one — scan the whole file for all `<<<<<<<` markers. 2. **For each block, identify both sides clearly**: - "Ours" / current branch (above `=======`) - "Theirs" / incoming branch (below `=======`, above `>>>>>>>`) - State what each side is actually trying to do, in plain language — don't just repeat the code back. 3. **Determine the right resolution** for each block using one of: - **Keep ours** — the incoming change is redundant, outdated, or superseded - **Keep theirs** — the current side should be discarded - **Combine both** — both changes are needed and don't actually conflict logically, just textually (e.g. two people added different functions in the same spot) - **Manual rewrite needed** — the two changes are logically incompatible and need a human decision; say so explicitly rather than guessing 4. **Never silently guess on logically incompatible changes.** If both sides modify the same logic in incompatible ways (e.g. one side changes a function's return type, the other changes its parameters), flag it as needing the user's judgment and explain the tradeoff of each option. 5. **Produce the res