vscode: resolve merge conflicts toolbar disappear
Does this issue occur when all extensions are disabled?: Yes
- Version: 1.70.0 (user setup)
- Date: 2022-08-04T04:38:16.462Z
- Electron: 18.3.5
- Chromium: 100.0.4896.160
- Node.js: 16.13.2
- V8: 10.0.139.17-electron.0
- OS: Windows_NT x64 10.0.19044
this is what I want:
and some days ago it works as expected, but today I found the toolbar just disappear.
but I get :
I’ve searched the question in Stackoverflow, and I got a similar question(https://stackoverflow.com/questions/47241098/accept-incoming-change-not-appearing-in-vs-code), and I’ve tried set editor.codeLens: true and diffEditor.codeLens: true, but it still not work.
Steps to Reproduce:
- init a git repo and do some branch merge operation
and here is my global git config if needed:
[core]
autocrlf = false
editor = code --wait --new-window
[remote "origin"]
proxy =
[credential]
helper = manager-core
[filter "lfs"]
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
[merge]
tool = vscode
[mergetool "vscode"]
cmd = code --wait --merge $REMOTE $LOCAL $BASE $MERGED
[diff]
tool = vscode
[difftool "vscode"]
cmd = code --wait --diff $LOCAL $REMOTE
About this issue
- Original URL
- State: closed
- Created 2 years ago
- Reactions: 35
- Comments: 22 (6 by maintainers)
This just happened to me too, the solution for me was to open settings (command+comma), search for
merge, and disableGit: Merge Editor.New merge tool itself is cool but the editor view without clear indication of the conflict is never I wanted.
I would like to have both. Is there any good reason to be them mutually exclusive?
It’s not a bug. As mentioned in the 1.70 release notes, the new merge editor has become the default. If you don’t want to use it, clear that checkbox.
@256hz thanks! That helped resolve this.
I doubt I would have figured out how to fix this if not for this issue (I assumed it was a bug and “Merge Editor” was the pre-1.70 thing I actually wanted to keep, so I was puttering around in “Merge Conflict” settings). I don’t always read release notes since they’re so lengthy (and judging by this thread, suspect I’m not the only one).
Honestly, what would really help is a “new since 1.70 (August 2022)” badge next to the setting. Then it would be immediately obvious. Bonus points for making such “new” settings searchable so I can quickly navigate through new settings.
Here’s my cruel attempt with MS Paint:
Thoughts?
@gjsjohnmurray Was it this section? https://code.visualstudio.com/updates/v1_70#_3way-merge-editor-improvements
It might’ve been helpful to provide information on reverting using the checkbox option that @256hz mentioned earlier.
This thread is a great help, too bad it’s hard to find. please do not close it. i believe there are tons of other dev are looking for this thread
yes it is mentioned in the release notes, but it says “The merge editor can be opened by clicking on a conflicting file in the Source Control view.”, so I have to manually click the panel ? is there any way that it will jump to the editor automatically after you type some merge operation in bash ?
i set it but, still doesn’t work