mk:resolving-merge-conflicts

Resolve an in-progress git merge or rebase conflict end to end: read the conflict state, recover each side's original intent, resolve every hunk, run the project's checks, and prepare the merge/rebase for an explicitly approved finish. Use when asked to "resolve merge conflicts", "fix this rebase", "finish the merge", or when git status shows conflicted (unmerged) paths. NOT for the full ship pipeline that merges…