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.
Accept Current Change or Accept Incoming Change... options do not appear in VSCode
See original GitHub issueDoes this issue occur when all extensions are disabled?: Yes/No
- VS Code Version: 1.64.0 Insiders
- OS Version: macOS 12.0
I am not seeing the “Accept Current Change” or “Accept Incoming Change” when viewing merge conflicts
I am expecting to see this (as defined in VSCode Documentation)
But instead I just see this (notice the top bar of choices is gone)
Issue Analytics
- State:
- Created 2 years ago
- Reactions:3
- Comments:16 (3 by maintainers)
Top Results From Across the Web
Accept Incoming Change not appearing in VS Code
Go to File > Preferences > Settings in VS code enter image description here · Search for Git: Merge Editor. enter image description...
Read more >"Accept Incoming Changes" not showing up. : r/vscode - Reddit
This no longer occurs. This is making it incredibly difficult to see what has changed. In preferences, the following are both enabled:
Read more >Accept Incoming Change Not Appearing In Vs Code - ADocLib
You can go to Settings and search for "codeLens" to make sure it is enabled. I hope this help somebody. If the Accept...
Read more >VS Code tips — The merge conflict code lens - YouTube
Use the merge conflict code lens to pick between your local changes or the incoming changes, make a few more edits, then commit...
Read more >Source Control with Git in Visual Studio Code
Tip: You can open VS Code in a sub-directory of a Git repository. VS Code's Git services will still work as usual, showing...
Read more >
Top Related Medium Post
No results found
Top Related StackOverflow Question
No results found
Troubleshoot Live Code
Lightrun enables developers to add logs, metrics and snapshots to live code - no restarts or redeploys required.
Start Free
Top Related Reddit Thread
No results found
Top Related Hackernoon Post
No results found
Top Related Tweet
No results found
Top Related Dev.to Post
No results found
Top Related Hashnode Post
No results found
Does setting
git.mergeEditortofalsehelp? Thanks!It’s back now 👍 ( I don’t know how but it’s working ).
FYI : @lszomoru