Resolve in Merge Editor-button not working

Support Bug Reports
1

Where does the bug appear (feature/product)?

Cursor IDE

Describe the Bug

I have the same problem as described in this issue: Resolve in Merge editor does nothing

I have GitLense installed, so I tried to disable it and restarted Cursor, it didn’t solve the problem.

I get no errors in the console in the developer tools.

This is a merge.

Steps to Reproduce

  • Try to merge a branch into another where you get a merge conflict.
  • Go to the file where the conflict appears and try to press “Resolve in Merge Editor”-button.
  • Nothing happens

Expected Behavior

That the Merge Editor would appear.

Operating System

MacOS

Version Information

Version: 3.0.16
VSCode Version: 1.105.1
Commit: 475871d112608994deb2e3065dfb7c6b0baa0c50
Date: 2026-04-09T05:33:51.767Z
Layout: editor
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

Does this stop you from using Cursor

Sometimes - I can sometimes use Cursor

5

Hey there!

Thanks for the report.

Can you open up the Developer Tools via Help > Toggle Developer Tools, reproduce the bug (click the button, nothing happens), and then send any errors from the Console tab?

7

Hi Colin!

Yesterday I didn’t get any errors in the Console Tab.
And now everything works again.. seems to be a tricky bug to find!

8

Hi again @Colin.

Today a similar problem appeared. This time I could enter the Merge Editor but when I try to press “Complete Merge”-button. Nothing happens.

Here is a screen recording of it. There is no new console errors when I press the button but there are a bunch of them from earlier in the process, don’t know if they can help you?

The problem was solved by leaving the Merge Editor and then enter it again. Then I could press the button.

Screenshot 2026-04-16 at 08.47.19
Screenshot 2026-04-16 at 08.47.191920×655 336 KB

9

And now I get the original problem again, I can’t press “Resolve in Merge Editor”.

My console looks like this, but nothing more adds up to the console when I press the button.

image
image1798×2518 1.54 MB

10

And now I tried again. I did this:

  1. Abort merge
  2. Restart Cursor
  3. Clear console
  4. Tried to merge again (with clear console)

Then this is the result. And I can still not press the “Resolve in Merge Editor”.

image
image1816×758 50.4 KB

11

Hey @Maja_Lund!

I still can’t reproduce on my side, but that last screenshot a great clue.

Could you capture the Git Output log next time this happens? You can find it via View > Output then selecting “Git” from the dropdown. Ideally, right after clicking “Resolve in Merge Editor” and seeing it not respond.

I expect that there will be some error, which should probably surface more clearly but at least helps us understand why it’s happening.

12

Here it is. I guess the “File not found” can give us a hint.
The file having the merge conflict is located at /Users/majalund/Documents/projects/cykelrum/AGENTS.md

Everytime I press the button these 3 lines gets added in the output:

2026-04-16 11:53:08.863 [info] > git show -s --decorate=full --shortstat --format=%H%n%aN%n%aE%n%at%n%ct%n%P%n%D%n%B -z HEAD -- [35ms] 

2026-04-16 11:53:08.864 [info] > git show -s --decorate=full --shortstat --format=%H%n%aN%n%aE%n%at%n%ct%n%P%n%D%n%B -z MERGE_HEAD -- [35ms] 

2026-04-16 11:53:08.866 [info] > git diff --name-status -z --diff-filter=ADMR MERGE_HEAD...HEAD [36ms]

image
image1920×704 281 KB

14

Thanks @Maja_Lund! I have a stable reproducer now!

It appears to reproduce only with Markdown files (when opening the merge editor).

So far, I haven’t been able to reproduce the “Complete Merge” issue you shared. Could you check if that second issue is also specific to certain file types (only .json files?)

If it happens again, could you capture the Git Output log right after clicking the button? (View > Output, then select “Git” from the dropdown like before) That would help us narrow it down.

We’ve filed the Markdown merge editor issue internally. In the meantime, you can resolve .md conflicts by editing the conflict markers directly in the text editor instead of using the merge editor.

15

Great!

I think the “Complete Merge”-problem also was on a MD-file. And I solved it as you suggest here, by editing it directly in the text editor instead.

But I let you know if the problem appears again and then I send more info about the output.

17

I’ve been experiencing the same issue as well, whenever I try to resolve a conflict in an .md file I can’t click the “Resolve in Merge Editor”.

Same error mentioned above on startup:
workbench.desktop.main.js:41672 [transport] Connect error in unary AI connect ConnectError: [invalid_argument] Error
at t (workbench.desktop.main.js:38816:61707)
at async Object.getTeamRepos (workbench.desktop.main.js:29268:4386)
at async fSm.pollRepoBlocklist (workbench.desktop.main.js:43445:2738) Object

Also this error when opening the diff of the .md file:

workbench.desktop.main.js:38781 [Extension Host] (node:29824) [DEP0040] DeprecationWarning: The punycode module is deprecated. Please use a userland alternative instead.
(Use Cursor Helper (Plugin) --trace-deprecation ... to show where the warning was created)

I’ve disabled all my extensions for the workspace to debug it but this error still shows up, so maybe it’s the extension manager itself and not a particular extension I have

This is the git output (I’ve ommitted some parts), no errors:

2026-05-05 14:59:11.724 [info] [main] Log level: Info
2026-05-05 14:59:11.746 [info] [main] Validating found git in: “/opt/homebrew/bin/git”
2026-05-05 14:59:11.780 [info] [main] Using git “2.52.0” from “/opt/homebrew/bin/git”
2026-05-05 14:59:11.780 [info] [Model][doInitialScan] Initial repository scan started
2026-05-05 14:59:12.075 [info] > git rev-parse --show-toplevel [212ms] (getRepositoryRoot)
2026-05-05 14:59:12.110 [info] > git rev-parse --git-dir --git-common-dir --show-superproject-working-tree [25ms]
2026-05-05 14:59:12.113 [info] [Model][openRepository] Opened repository: /Users/
2026-05-05 14:59:12.113 [info] [Model][openRepository] Opened repository (kind): repository
2026-05-05 14:59:12.115 [info] [Model][doInitialScan] Initial repository scan completed - repositories (1), closed repositories (0), parent repositories (0), unsafe repositories (0)
2026-05-05 14:59:12.139 [info] > git for-each-ref --format=%(refname)%00%(upstream:short)%00%(objectname)%00%(upstream:track)%00%(upstream:remotename)%00%(upstream:remoteref) --ignore-case refs/heads/ refs/remotes/ [21ms]

2026-05-05 14:59:12.417 [info] > git for-each-ref --sort -committerdate --format %(refname)%00%(objectname)%00%(*objectname) [35ms]
2026-05-05 14:59:12.434 [info] > git diff --name-status -z --diff-filter=ADMR …refs/remotes/origin/ [19ms]
2026-05-05 14:59:12.476 [info] > git status -z -uall [96ms]
2026-05-05 14:59:12.642 [info] > git check-ignore -v -z --stdin [14ms]

2026-05-05 14:59:21.790 [info] > git config --global user.name [9ms]
2026-05-05 14:59:21.797 [info] > git config --global user.email [6ms]
2026-05-05 14:59:21.797 [info] [main] Stored git author name in global state:
2026-05-05 14:59:26.282 [info] > git diff --name-status -z --diff-filter=ADMR MERGE_HEAD…HEAD [9ms]
2026-05-05 14:59:26.284 [info] > git show -s --decorate=full --shortstat --format=%H%n%aN%n%aE%n%at%n%ct%n%P%n%D%n%B -z HEAD – [12ms]
2026-05-05 14:59:26.297 [info] > git show -s --decorate=full --shortstat --format=%H%n%aN%n%aE%n%at%n%ct%n%P%n%D%n%B -z MERGE_HEAD – [24ms]

And a warning from GitHub output:

2026-05-05 14:59:11.724 [info] Log level: Info
2026-05-05 14:59:12.322 [warning] [GitHubBranchProtectionProvider][updateRepositoryBranchProtection] Failed to update repository branch protection: No GitHub authentication session available.

And from GitHub Authentication:

2026-05-05 14:59:12.376 [info] Reading sessions from keychain…
2026-05-05 14:59:12.376 [info] Getting sessions for all scopes…
2026-05-05 14:59:12.376 [info] Getting sessions for all scopes…
2026-05-05 14:59:12.376 [info] Getting sessions for all scopes…
2026-05-05 14:59:12.376 [info] Got 0 sessions for …
2026-05-05 14:59:12.376 [info] Got 0 sessions for …
2026-05-05 14:59:12.376 [info] Got 0 sessions for …
2026-05-05 14:59:12.376 [info] Getting sessions for read:user,repo,user:email,workflow…
2026-05-05 14:59:12.376 [info] Got 0 sessions for read:user,repo,user:email,workflow…
2026-05-05 14:59:12.376 [info] Getting sessions for all scopes…
2026-05-05 14:59:12.376 [info] Got 0 sessions for …
2026-05-05 14:59:12.376 [info] Reading sessions from keychain…
2026-05-05 14:59:12.376 [info] Getting sessions for all scopes…
2026-05-05 14:59:12.376 [info] Got 0 sessions for …
2026-05-05 14:59:12.376 [info] Getting sessions for all scopes…
2026-05-05 14:59:12.376 [info] Got 0 sessions for …
2026-05-05 14:59:12.376 [info] Getting sessions for all scopes…
2026-05-05 14:59:12.376 [info] Got 0 sessions for …
2026-05-05 14:59:12.376 [info] Getting sessions for read:user,repo,user:email,workflow…
2026-05-05 14:59:12.376 [info] Got 0 sessions for read:user,repo,user:email,workflow…
2026-05-05 14:59:12.376 [info] Getting sessions for all scopes…
2026-05-05 14:59:12.376 [info] Got 0 sessions for …

In case it’s relevant I’m using SSH, not a PAT over https

18

Hi,
just +1 on the repeatability of Markdown conflicts and no Merge Editor availability.
Thanks for looking into this