question-mark
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:

  1. 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

image image

Issue Analytics

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

github_iconTop 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

Read more comments on GitHub >

github_iconTop Results From Across the Web

How Do I Resolve Merge Conflicts? - DEV Community ‍ ‍
Navigate to the file that Git indicated had a merge conflict and ... When you open a PR on GitHub, it will let...
Read more >
How do I deal with conflicts in my Git repo? - Beanstalk Help
A conflict occurs when you ask Git to merge two versions of a file and it can't figure out which version to pick....
Read more >
Resolved git merge conflict in VS Code, but still says unresolved
In VSCode when you have conflicts in multiple files, they're shown in the git panel and you can open files one by one...
Read more >
How to resolve a git merge conflict - Opensource.com
Then it says fix conflicts and then commit the result, so if you follow directions, edit the file, then commit it, everything should...
Read more >
Cannot continue git rebase after conflict resolution: file needs ...
US #65456 When you have resolved this problem, run "git rebase --continue". ... editor.js # # Changes not staged for commit: # (use...
Read more >

github_iconTop Related Medium Post

No results found

github_iconTop Related StackOverflow Question

No results found

github_iconTroubleshoot Live Code

Lightrun enables developers to add logs, metrics and snapshots to live code - no restarts or redeploys required.
Start Free

github_iconTop Related Reddit Thread

No results found

github_iconTop Related Hackernoon Post

No results found

github_iconTop Related Tweet

No results found

github_iconTop Related Dev.to Post

No results found

github_iconTop Related Hashnode Post

No results found