Stuck on an issue?

Lightrun Answers was designed to reduce the constant googling that comes with debugging 3rd party libraries. It collects links to all the places you might be looking at while hunting down a tough bug.

And, if you’re still stuck at the end, we’re happy to hop on a call to see how we can help out.

[Bug] editor could not be opened if a file have conflict with added by us

See original GitHub issue

Does this issue occur when all extensions are disabled?: Yes/No

VS Code Version: latest
OS Version: MACOS 12.4

Steps to Reproduce:

create a merge conflict and some file is added by us 2.open the file change

CONFLICT (file location):/path/to/file added in HEAD inside a directory that was renamed in dev, suggesting it should perhaps be moved to /path/to/file

Issue Analytics

State:
Created a year ago
Reactions:5
Comments:8 (3 by maintainers)

Top GitHub Comments

2reactions

danielearwickercommented, Nov 14, 2022

I hit this issue, and find that if I click the file name under Merge Changes, I get the above error. But if I click the “Open file” icon on that line, it opens the file as if to let me see the conflicts, but there are no conflicts (there definitely should be!)

There is the usual button bottom/right to open the Merge UX and that opens to show me the current branch on the left and incoming on the right, but the incoming panel is like an empty file.

0reactions

kpierce8commented, Oct 7, 2022

same here as well, windows 10, VS Code updated