No fix button when merge conflicts

[jiangzm]

Type: Bug

Merge editor option is off.

VS Code version: Code 1.79.1 (4cb974a7aed77a74c7813bdccd99ee0d04901215, 2023-06-12T16:16:49.215Z) OS version: Darwin x64 22.4.0 Modes:

System Info

|Item|Value| |---|---| |CPUs|Intel(R) Core(TM) i7-9750H CPU @ 2.60GHz (12 x 2600)| |GPU Status|2d_canvas: enabled
canvas_oop_rasterization: disabled_off
direct_rendering_display_compositor: disabled_off_ok
gpu_compositing: enabled
metal: disabled_off
multiple_raster_threads: enabled_on
opengl: enabled_on
rasterization: enabled
raw_draw: disabled_off_ok
video_decode: enabled
video_encode: enabled
vulkan: disabled_off
webgl: enabled
webgl2: enabled
webgpu: enabled| |Load (avg)|6, 5, 5| |Memory (System)|16.00GB (0.10GB free)| |Process Argv|--crash-reporter-id c56e7fcc-f3a0-4bda-b491-d7b7526c167c --crash-reporter-id c56e7fcc-f3a0-4bda-b491-d7b7526c167c --crash-reporter-id c56e7fcc-f3a0-4bda-b491-d7b7526c167c| |Screen Reader|no| |VM|0%|

Extensions (39)

Extension|Author (truncated)|Version ---|---|--- dart-code|Dar|3.66.0 flutter|Dar|3.66.0 vscode-markdownlint|Dav|0.51.0 vscode-eslint|dba|2.4.0 docs-linting|doc|0.0.13 githistory|don|0.6.20 es7-react-js-snippets|dsz|4.4.3 prettier-vscode|esb|9.13.0 go|gol|0.39.0 vscode-peacock|joh|4.2.2 vscode-leetcode|Lee|0.18.1 git-graph|mhu|1.30.0 vscode-dapr|ms-|0.7.0 vscode-docker|ms-|1.25.1 vscode-language-pack-zh-hans|MS-|1.79.2023061409 csharp|ms-|1.25.9 vscode-edge-devtools|ms-|2.1.2 vscode-kubernetes-tools|ms-|1.3.13 isort|ms-|2022.8.0 python|ms-|2023.10.1 vscode-pylance|ms-|2023.6.20 jupyter|ms-|2023.5.1001582324 jupyter-keymap|ms-|1.1.2 jupyter-renderers|ms-|1.0.15 vscode-jupyter-cell-tags|ms-|0.1.8 vscode-jupyter-slideshow|ms-|0.1.5 remote-containers|ms-|0.295.0 remote-ssh|ms-|0.102.0 remote-ssh-edit|ms-|0.86.0 remote-wsl|ms-|0.79.5 vscode-remote-extensionpack|ms-|0.24.0 hexeditor|ms-|1.9.11 remote-explorer|ms-|0.4.0 remote-server|ms-|1.2.1 vscode-yaml|red|1.13.0 intellicode-api-usage-examples|Vis|0.2.7 vscodeintellicode|Vis|1.2.30 vscode-icons|vsc|12.4.0 volar|Vue|1.6.4

A/B Experiments

``` vsliv368cf:30146710 vsreu685:30147344 python383cf:30185419 vspor879:30202332 vspor708:30202333 vspor363:30204092 vslsvsres303:30308271 vserr242:30382549 pythontb:30283811 vsjup518:30340749 pythonptprofiler:30281270 vshan820:30294714 vstes263:30335439 vscoreces:30445986 vscod805cf:30301675 binariesv615:30325510 bridge0708:30335490 bridge0723:30353136 vsaa593cf:30376535 pythonvs932:30410667 vsclangdc:30486549 c4g48928:30535728 dsvsc012:30540252 pynewext54:30695312 azure-dev_surveyone:30548225 2e4cg342:30602488 pyind779:30671433 89544117:30613380 pythonsymbol12:30671437 2i9eh265:30646982 showlangstatbar:30737416 vsctsb:30748421 pythonms35:30701012 pythonfmttext:30731395 pythoncmvfstrcf:30756944 fixhidewlkth:30730051 hideindicator:30766889 pythongtdpathcf:30739705 dh2dc718:30763024 pythonnosmt12:30765603 ```

[hediet]

Please share a screenshot. Thanks!

[jiangzm]

Buttons are restored but do nothing.