vscode
vscode copied to clipboard
microsoft
Merge Editor broke
Type: Bug
i'm rebasing and have a merge conflict in a file. After the last update to insiders, vscode no longer detects where the merge conflict is (no highlights, no Accept yours, theirs, both buttons). The file is marked as "has conflicts" in the UI (! on the tab). If I open the file in vscode (stable) (Version: 1.69.2 (user setup) Commit: 3b889b090b5ad5793f524b5d1d39fda662b96a2a Date: 2022-07-18T16:12:52.460Z 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 works fine.
VS Code version: Code - Insiders 1.70.0-insider (cc098faebd320a2eea3da6ae154b7e2e1347a4b9, 2022-07-26T05:16:55.337Z) OS version: Windows_NT x64 10.0.19044 Modes:
System Info
| Item | Value |
|---|---|
| CPUs | Intel(R) Core(TM) i9-9940X CPU @ 3.30GHz (28 x 3312) |
| GPU Status | 2d_canvas: enabled canvas_oop_rasterization: disabled_off direct_rendering_display_compositor: disabled_off_ok gpu_compositing: enabled multiple_raster_threads: enabled_on opengl: enabled_on rasterization: enabled raw_draw: disabled_off_ok skia_renderer: enabled_on video_decode: enabled video_encode: enabled vulkan: disabled_off webgl: enabled webgl2: enabled |
| Load (avg) | undefined |
| Memory (System) | 63.71GB (39.08GB free) |
| Process Argv | --crash-reporter-id 213ab4cc-3c1d-45bb-a742-965ecf4d5be3 |
| Screen Reader | no |
| VM | 0% |
Extensions (24)
| Extension | Author (truncated) | Version |
|---|---|---|
| vscode-research | alb | 210426.0.2 |
| vscode-instant-markdown | dba | 1.4.7 |
| githd | hui | 2.3.3 |
| devinsights | Mic | 2022.6.23-2 |
| tdpcode | Mic | 1.8.7 |
| python | ms- | 2022.10.1 |
| vscode-pylance | ms- | 2022.7.40 |
| jupyter | ms- | 2022.6.1201981810 |
| jupyter-keymap | ms- | 1.0.0 |
| jupyter-renderers | ms- | 1.0.9 |
| remote-containers | ms- | 0.243.0 |
| remote-ssh | ms- | 0.84.0 |
| remote-ssh-edit | ms- | 0.80.0 |
| remote-wsl | ms- | 0.66.3 |
| vscode-remote-extensionpack | ms- | 0.21.0 |
| cpptools | ms- | 1.11.4 |
| powershell | ms- | 2022.6.3 |
| vsliveshare | ms- | 1.0.5663 |
| gnls | mse | 0.1.3 |
| proto | pet | 0.0.2 |
| partial-diff | ryu | 1.4.3 |
| rewrap | stk | 1.16.3 |
| change-case | wma | 1.0.0 |
| clang-format | xav | 1.9.0 |
A/B Experiments
vsliv695:30137379
vsins829:30139715
vsliv368:30146709
vsreu685:30147344
python383:30185418
vspor879:30202332
vspor708:30202333
vspor363:30204092
vslsvsres303:30308271
pythonvspyl392:30422396
pythontb:30258533
pythonvspyt551:30291412
pythonptprofiler:30281269
vshan820:30294714
pythondataviewer:30285072
vscod805cf:30301675
bridge0708:30335490
bridge0723:30353136
vsaa593cf:30376535
pythonvs932:30404738
wslgetstarted:30449409
vscscmwlcmt:30465136
cppdebug:30492333
pylanb8912:30522163
vsclangdf:30492506
c4g48928:30534994
Yes, it's set to true according to vscode preferences.
From: John Murray @.> Sent: Tuesday, July 26, 2022 2:18 PM To: microsoft/vscode @.> Cc: Jineen Seirup @.>; Author @.> Subject: Re: [microsoft/vscode] Merge Editor broke (Issue #156361)
Have you set the git.mergeEditor setting?
Reply to this email directly, view it on GitHubhttps://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fmicrosoft%2Fvscode%2Fissues%2F156361%23issuecomment-1195991146&data=05%7C01%7Cjineens%40microsoft.com%7C1dd5a6295b3541446fb708da6f4c6322%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637944671125510140%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=D%2B2CW3LND5ds3xNlAEhQN5IDdYY%2BSvI8kCfVm4R7pjQ%3D&reserved=0, or unsubscribehttps://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fnotifications%2Funsubscribe-auth%2FAKS4N5SESHO4YB4GD3QQ6X3VWBI2LANCNFSM54XITMXA&data=05%7C01%7Cjineens%40microsoft.com%7C1dd5a6295b3541446fb708da6f4c6322%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637944671125510140%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=Fg%2F6qFslMwG07dbuGcSoLdE4IwBhvxIsuXVmqOlMspI%3D&reserved=0. You are receiving this because you authored the thread.Message ID: @.***>
I'm seeing the same problem. After I enabled git.mergeEditor to true in my settings, merge conflicts don't show any UI affordances in the editor (only the <<<< and >>>> markers), so this feels like a regression.
Version: 1.69.2 (Universal) Commit: 3b889b090b5ad5793f524b5d1d39fda662b96a2a Date: 2022-07-18T16:12:57.074Z (1 wk ago) Electron: 18.3.5 Chromium: 100.0.4896.160 Node.js: 16.13.2 V8: 10.0.139.17-electron.0 OS: Darwin arm64 21.5.0
@djc are you able to test with Insiders. Endgame started on Monday, so 1.70 ought to ship by the end of next week. I think it contains some fixes for the new merge editor. Though the OP reported this issue on Insiders...
same here
Version: 1.70.0-insider
Commit: b4d5b4ed69af953901051b1f049851b9dca3563e
Date: 2022-07-28T05:16:00.371Z
Electron: 18.3.5
Chromium: 100.0.4896.160
Node.js: 16.13.2
V8: 10.0.139.17-electron.0
OS: Darwin arm64 21.6.0
if we disable the git.mergeEditor it works again.
git.mergeEditor=false works, git.openDiffOnClick (156642) has no effect on whether the merge editor works or not.
Same for me, setting git.openDiffOnClick has no effect on this. The 3-way-merge simply doesn't work.
Then I disabled and enabled the GitLens and Git Graph plugins, and then, it somehow worked. Magic 🙌
Can confirm, turning git.mergeEditor off (false) brought the UI back for me.
Can confirm, turning
git.mergeEditoroff (false) brought the UI back for me.
Same
Same for me, setting
git.openDiffOnClickhas no effect on this. The 3-way-merge simply doesn't work. Then I disabled and enabled the GitLens and Git Graph plugins, and then, it somehow worked. Magic 🙌
I disabled GitGraph, then restarted - now the merge editor works.
Enabled GitGraph again, and it's immediately back to not working. Restarting again does not help.
So it looks like a conflict with GitGraph. (having to choose between this feature and Git Graph is... 😢💔)
Can confirm, turning
git.mergeEditoroff (false) brought the UI back for me.
This does nothing for me.
Thanks for creating this issue! We figured it's covering the same as another one we already have. Thus, we closed this one as a duplicate. You can search for similar existing issues. See also our issue reporting guidelines.
Happy Coding!
@hediet I don't experience this issue myself, but 2 people at my company reported this separately: after VS Code upgrade they don't have any merge editor at all in cases where they expect one - they don't get new 3-view editor, they just see plain code with <<< === >>> markers. So I believe this one should be reopened.
Yes, I'm still seeing this and I don't believe it is a duplicate of #157610. I would actually like to try the new 3-view editor but have not seen it appear with mergeEditor = true.
@maquak @djc did you open the conflicting file in the SCM view? Was the result file opened before?
I did not open it in the SCM view. I think I've probably seen both files that were opened before and files that were not.
Then that is the issue, you have to open the conflicting file in the SCM view!
That just seems like a usability issue, where the editor view no longer has any affordances to help deal with merging?
If the 3-way merge editor only shows up in the SCM view, then the corresponding setting should also only affect the SCM view. Either make the 3-way editor fully replace the old inline editor (when enabled), or leave non-SCM views alone (show the old way, even when mergeEditor = true.