Merge Conflicts with not existing files that have been renamed causes 'null' editor

[sschneider-ihre-pvs]

Type: Bug The scenario is as follow.

1. I created some new files in folder A
2. Meanwhile folder A got renamed to folder B in main branch
3. I get merge conflicts trying to merge main into my branch
4. The conflicting files show the correct path to folder B but when clicked on I get an empty editor Also, the 3-way-merge editor does not open. Right Click and 'Accept all Current' doesn't work either

Mitigation:

1. Clicking the 'open file' icon
2. Clicking 'Open in Merge editor'
3. this shows an empty file and the current file and makes the conflict resolveable

VS Code version: Code - Insiders 1.72.0-insider (a829fbb91cbae44afb6a389341a0763fb3a6ac6f, 2022-09-20T05:17:31.528Z) OS version: Windows_NT x64 10.0.19043 Modes: Sandboxed: Yes

System Info

|Item|Value| |---|---| |CPUs|Intel(R) Core(TM) i7-10700 CPU @ 2.90GHz (16 x 2904)| |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
webgpu: disabled_off| |Load (avg)|undefined| |Memory (System)|15.75GB (0.84GB free)| |Process Argv|--log-net-log=netlog.json --ignore-certificate-error --crash-reporter-id 5f9e326c-2a01-458b-95a4-f411641d6f56| |Screen Reader|no| |VM|0%|

Extensions (37)

Extension|Author (truncated)|Version ---|---|--- better-comments|aar|3.0.2 iconify|ant|0.4.2 icons-carbon|ant|0.2.5 smart-clicks|ant|0.1.1 vscode-apollo|apo|1.19.11 atlascode|atl|2.10.12 markdown-shiki|bie|0.1.1 path-intellisense|chr|2.8.1 vscode-eslint|dba|2.2.6 dendron|den|0.112.0 dendron-paste-image|den|1.1.1 gitlens-insiders|eam|2022.9.1905 EditorConfig|Edi|0.16.4 vscode-great-icons|emm|2.1.86 prettier-vscode|esb|9.8.0 vscode-firefox-debug|fir|2.9.8 gitlab-workflow|Git|3.51.0 vscode-graphql|Gra|0.7.5 vscode-graphql-syntax|Gra|1.0.4 vscode-peacock|joh|4.2.1 i18n-ally|lok|2.8.1 ts-error-translator|mat|0.5.1 dotenv|mik|1.0.1 prettify-json|moh|0.0.3 vscode-scss|mrm|0.10.0 angular-console|nrw|17.22.0 vscode-twoslash-queries|Ort|1.0.2 inline-sql-syntax|quf|2.15.0 vscode-yaml|red|1.10.1 sonarlint-vscode|Son|3.10.0 sass-indented|syl|1.8.22 tabnine-vscode|Tab|3.6.15 vscodeintellicode|Vis|1.2.27 vscode-conventional-commits|viv|1.24.2 volar|Vue|0.40.13 vscode-typescript-vue-plugin|Vue|0.40.13 change-case|wma|1.0.0 (2 theme extensions excluded)

A/B Experiments

``` vsliv695:30137379 vsins829:30139715 vsliv368:30146709 vsreu685:30147344 python383cf:30185419 vspor879:30202332 vspor708:30202333 vspor363:30204092 vslsvsres303:30308271 pythonvspyl392:30422396 pythontb:30258533 pythonptprofiler:30281269 vshan820:30294714 pythondataviewer:30285072 vscod805cf:30301675 bridge0708:30335490 bridge0723:30353136 cmake_vspar411cf:30557515 vsaa593:30376534 pythonvs932:30404738 cppdebug:30492333 vscaat:30438846 vsclangdf:30492506 c4g48928:30535728 dsvsc012cf:30540253 pylantcb52:30568093 vscccc:30564267 pyindex848:30568094 ```

[sschneider-ihre-pvs]

@hediet Probably your turf ;)

[abhijit-chikane]

Same happened with me.

[sladg]

Experience same issue, however, seems like it's problem in Git considering that Vscode, Git CLI, nor Gitlens take care of this.