JetBrains-style three-pane merge resolver for VS Code and Cursor: yours | editable result | theirs, scroll-synced, with accept/ignore gutters, word diffs, authorship chips, and a history timeline. One-click apply for non-conflicting changes; Magic Resolve keeps both sides on pure adds and refuses to guess on rewrites. Optional AI (Copilot or your own key) explains and resolves after reading your repo — not just conflict markers. Nothing hits git until you Apply. Free and open source.