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
create a merge conflict in a file
open the file and try to click the merge editor button
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.
I just had the same thing happen to me today. But it worked immediately after, I had clicked a few things in the UI like closing the lower panel with the terminal windows, and then opening the Developer Tools as advised here. When I then clicked the “Merge Editor” button, the editor opened. So maybe it’s something with focus in the UI
Hey, thanks for flagging this. We’ve seen this workaround a couple times already, and yeah, it seems related to focus or the editor state.
A few quick questions so we can match this with other reports:
What file type was involved in the conflict, especially .md or other Markdown files?
What Cursor version are you on?
Was this a merge, rebase, or cherry-pick?
This is a bug on our side and we’re tracking it. No exact ETA for a fix yet. If it happens again, open Help > Toggle Developer Tools, reproduce it, and send any errors from the Console. That’ll help us confirm the cause.
Thanks also. One of the files with a conflict was an .md file, but the file I tried it on was a .ts file I’m pretty sure. It was a merge of both versions, and since it was the first time I had to this in Cursor, I couldn’t quite figure out how to do it (a good chance that’s totally on me). Being in a bit of a rush, I aborted and let the AI do the merge for me…
The Cursor version was 3.1.15-1776218801 (that’s the version on the Debian package).
When it happens next time, I’ll try again and I’ll immediately open Dev Tools to see if I get any errors.
Thanks for the details. This matches what we’re already seeing in other reports, especially the part about a .md file being in the conflict set. We’re tracking that scenario. There’s no ETA for a fix yet.
If you catch it happening again, a couple helpful things:
Open Help > Toggle Developer Tools before clicking, reproduce it, then share whatever shows up in the Console.
Let us know which file was active or focused at the moment of the click (.md or .ts), and whether anything opened at all when you clicked the .md.
Your note about focus and UI state is helpful too.