Merge Editor unusable

Where does the bug appear (feature/product)?

Cursor IDE

Describe the Bug

When resolving a Merge conflict in a file the merge editor button shows but it does not to react on click. The button does work in VSCode when resolving the identical merge conflict.

Steps to Reproduce

  1. create a merge conflict in a file
  2. open the file and try to click the merge editor button

Expected Behavior

The merge editor window should open

Operating System

MacOS

Version Information

IDE:
Version: 2.6.22 (Universal)
VSCode Version: 1.105.1
Commit: c6285feaba0ad62603f7c22e72f0a170dc8415a0
Date: 2026-03-27T15:59:31.561Z
Build Type: Stable
Release Track: Default
Electron: 39.8.1
Chromium: 142.0.7444.265
Node.js: 22.22.1
V8: 14.2.231.22-electron.0
OS: Darwin arm64 25.3.0

Additional Information

Visual Studio Code information:

Version: 1.113.0 (Universal)
Commit: cfbea10c5ffb233ea9177d34726e6056e89913dc
Datum: 2026-03-24T15:07:18+01:00
Electron: 39.8.3
ElectronBuildId: 13620978
Chromium: 142.0.7444.265
Node.js: 22.22.1
V8: 14.2.231.22-electron.0
Betriebssystem: Darwin arm64 25.3.0

Does this stop you from using Cursor

No - Cursor works, but with this issue

Hey, thanks for the report. A similar issue was already reported here Resolve in Merge editor does nothing and in that case it went away on its own after a day or two.

To help narrow it down, can you check a couple things:

  • Do you have any Git extensions installed like GitLens, Git Graph, etc? If yes, try disabling them and test again.
  • Open Developer Tools via Help > Toggle Developer Tools, reproduce the bug, then send any errors from the Console tab.
  • Is this a merge, rebase, or cherry-pick conflict?

If it’s still happening, share what the console shows and it’ll help us figure out the cause.