Repository: vscode
Issue: Merge Editor: Incoming change shown as empty
Labels: bug,git,merge-editor


Type: <b>Bug</b>

Not sure I understand what is going on, I have the Copilot Chat repo checked out locally:
- Locally checked out private branch and clean (pushed as `chrmarti/207809-local` branch).
- `origin/main` is at a9acd8ab8d553b9dbccd833a0f21ecfb1d6ee457.
- Do `git rebase origin/main`.
- Get a merge conflict in `constants.ts`.
- Opening it opens the editor with the old merge conflict annotations.
- Clicking 'Open Merge Editor' opens that with the Incoming side empty (unexpected).
- Clicking 'Complete Merge' closes the merge editor and shows in the code editor that the merge conflict was removed (somewhat unexpected, but I don't really know what is going on).


VS Code version: Code - Insiders 1.88.0-insider (99a19815253d91900be5ec1016e0ecc7cc9a6950, 2024-03-14T05:50:25.191Z)
OS version: Darwin arm64 23.3.0
Modes:

<details>
<summary>System Info</summary>

|Item|Value|
|---|---|
|CPUs|Apple M1 Max (10 x 24)|
|GPU Status|2d_canvas: enabled<br>canvas_oop_rasterization: enabled_on<br>direct_rendering_display_compositor: disabled_off_ok<br>gpu_compositing: enabled<br>multiple_raster_threads: enabled_on<br>opengl: enabled_on<br>rasterization: enabled<br>raw_draw: disabled_off_ok<br>skia_graphite: disabled_off<br>video_decode: enabled<br>video_encode: enabled<br>webgl: enabled<br>webgl2: enabled<br>webgpu: enabled|
|Load (avg)|4, 5, 5|
|Memory (System)|64.00GB (0.66GB free)|
|Process Argv|--log trace|
|Screen Reader|no|
|VM|0%|
</details><details><summary>Extensions (57)</summary>

Extension|Author (truncated)|Version
---|---|---
openmatchingfiles|bca|0.5.4
unique-lines|bib|1.0.0
devcontainer-image-convert|Bri|0.0.1
network-proxy-test|chr|0.0.11
regex|chr|0.4.0
esbuild-problem-matchers|con|0.0.3
vscode-eslint|dba|2.4.4
prettier-vscode|esb|10.1.0
codespaces|Git|1.16.13
copilot|Git|1.172.766
copilot-chat|Git|0.14.2024031401
remotehub|Git|0.62.0
vscode-pull-request-github|Git|0.85.2024031404
vscode-drawio|hed|1.6.6
rest-client|hum|0.25.1
template-string-converter|meg|0.6.1
regexsnippets|Mon|1.0.2
vscode-docker|ms-|1.29.0
vscode-language-pack-de|MS-|1.87.2024031309
vscode-language-pack-qps-ploc|MS-|1.87.2024031309
black-formatter|ms-|2024.1.10681007
debugpy|ms-|2024.3.10731010
python|ms-|2024.3.10741005
vscode-pylance|ms-|2024.3.100
jupyter|ms-|2024.3.2024031401
jupyter-hub|ms-|2023.10.1003492320
jupyter-keymap|ms-|1.1.2
jupyter-renderers|ms-|1.0.17
vscode-jupyter-cell-tags|ms-|0.1.8
vscode-jupyter-slideshow|ms-|0.1.5
remote-containers|ms-|0.349.0
remote-ssh|ms-|0.109.0
remote-ssh-edit|ms-|0.86.0
remote-wsl|ms-|0.86.0
vscode-remote-extensionpack|ms-|0.25.0
azure-repos|ms-|0.38.0
extension-test-runner|ms-|0.0.6
hexeditor|ms-|1.9.14
live-server|ms-|0.5.2024010901
remote-explorer|ms-|0.5.2024031109
remote-repositories|ms-|0.40.0
remote-server|ms-|1.6.2024031109
test-adapter-converter|ms-|0.1.9
vscode-github-issue-notebooks|ms-|0.0.130
vscode-selfhost-test-provider|ms-|0.3.25
vscode-speech|ms-|0.7.2024031110
vscode-yaml|red|1.14.0
vscode-dall-toys|rob|0.0.7
rust-analyzer|rus|0.4.1880
crates|ser|0.6.6
eval|Sto|0.0.6
vscode-open-in-github|sys|1.18.0
even-better-toml|tam|0.19.2
shellcheck|tim|0.37.0
non-github-remote-source-provider|und|0.0.1
vscode-lldb|vad|1.10.0
intellicode-api-usage-examples|Vis|0.2.8


</details>
<!-- generated by issue reporter -->