search

microsoft / vscode

Visual Studio Code
https://code.visualstudio.com
MIT License
162.29k stars 28.57k forks source link

Merge editor shows strange characters when doing cherry pick merge #224491

Open karthiknadig opened 1 month ago

karthiknadig commented 1 month ago

Type: Bug

Repro steps:

  1. Have conflicting changes in two branches.
  2. Cherry pick commit from one branch into another.
  3. Use merge editor to handle conflict
image

VS Code version: Code - Insiders 1.92.0-insider (3bb157866cdb10b90e5f5999e1d9855c294aa7c7, 2024-07-31T12:31:58.409Z) OS version: Windows_NT x64 10.0.22621 Modes:

System Info |Item|Value| |---|---| |CPUs|Intel(R) Xeon(R) W-2133 CPU @ 3.60GHz (12 x 3600)| |GPU Status|2d_canvas: enabled
canvas_oop_rasterization: enabled_on
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_graphite: disabled_off
video_decode: enabled
video_encode: enabled
vulkan: disabled_off
webgl: enabled
webgl2: enabled
webgpu: enabled
webnn: disabled_off| |Load (avg)|undefined| |Memory (System)|31.73GB (16.85GB free)| |Process Argv|. --log ms-python.python=info --crash-reporter-id 14c3c992-da76-47b9-9893-1c07c5999093| |Screen Reader|no| |VM|0%|
Extensions (18) Extension|Author (truncated)|Version ---|---|--- tsl-problem-matcher|amo|0.6.2 ruff|cha|2024.36.0 vscode-eslint|dba|3.0.10 gitlens|eam|15.2.3 EditorConfig|Edi|0.16.4 prettier-vscode|esb|10.4.0 copilot|Git|1.219.1019 copilot-chat|Git|0.19.2024073102 vscode-github-actions|git|0.26.3 vscode-pull-request-github|Git|0.93.2024072609 vscode-docker|ms-|1.29.1 debugpy|ms-|2024.10.0 python|ms-|2024.13.2024073102 vscode-pylance|ms-|2024.7.104 remote-containers|ms-|0.381.0 remote-wsl|ms-|0.88.2 rust-analyzer|rus|0.3.2053 vscode-lldb|vad|1.10.0
A/B Experiments ``` vsliv368cf:30146710 vspor879:30202332 vspor708:30202333 vspor363:30204092 vscod805cf:30301675 vsaa593cf:30376535 py29gd2263:31024238 c4g48928:30535728 962ge761:30841072 pythongtdpath:30726887 welcomedialog:30812478 pythonnoceb:30776497 asynctok:30898717 dsvsc013:30777762 dsvsc014:30777825 dsvsc015:30821418 pythonregdiag2:30926734 pythonmypyd1:30859725 h48ei257:31000450 pythontbext0:30879054 accentitlementst:30870582 dsvsc016:30879898 dsvsc017:30880771 dsvsc018:30880772 cppperfnew:30980852 pythonait:30973460 945dj816:31013170 a69g1124:31018687 dvdeprecation:31040973 dwnewjupyter:31046869 2f103344:31071589 nb_pkg_only:31057982 nativerepl1:31104042 refactort:31084545 pythonrstrctxt:31093868 1iic9185:31091668 flighttreat:31105043 nativeloc1:31106922 ```
hediet commented 1 month ago

I also saw this a couple of times. I have no idea what causes this.

@deepak1556 does this ring a bell?

Image