Source Control stages Merge Changes when trying to stage all Changes #96640
Description
Issue Type: Bug
During a rebase (not sure if that's the only scenario), my SOURCE CONTROL tab display three sections, MERGE CHANGES, STAGED CHANGES and CHANGES.
If I click the + button on the CHANGES section, in order to stage all items below CHANGES, VS Code also adds everything on MERGE CHANGES.
VS Code version: Code - Insiders 1.45.0-insider (4bd2068, 2020-04-29T05:33:59.143Z)
OS version: Windows_NT x64 10.0.18363
System Info
| Item | Value |
|---|---|
| CPUs | Intel(R) Core(TM) i7-4790 CPU @ 3.60GHz (8 x 3592) |
| GPU Status | 2d_canvas: enabled flash_3d: enabled flash_stage3d: enabled flash_stage3d_baseline: enabled gpu_compositing: enabled multiple_raster_threads: enabled_on oop_rasterization: disabled_off protected_video_decode: unavailable_off rasterization: enabled skia_renderer: disabled_off_ok video_decode: enabled viz_display_compositor: enabled_on viz_hit_test_surface_layer: disabled_off_ok webgl: enabled webgl2: enabled |
| Load (avg) | undefined |
| Memory (System) | 7.94GB (1.28GB free) |
| Process Argv | |
| Screen Reader | no |
| VM | 0% |
Extensions (19)
| Extension | Author (truncated) | Version |
|---|---|---|
| markdown-mermaid | bie | 1.5.0 |
| better-toml | bun | 0.3.2 |
| vscode-eslint | dba | 2.1.5 |
| gitlens | eam | 10.2.1 |
| plantuml | jeb | 2.13.8 |
| svg | joc | 1.1.8 |
| vscode-peacock | joh | 3.7.0 |
| chat | kar | 0.33.0 |
| rust-analyzer | mat | 0.2.151 |
| vscode-todo-parser | min | 1.9.1 |
| remote-wsl | ms- | 0.44.2 |
| vsliveshare | ms- | 1.0.2104 |
| vsliveshare-audio | ms- | 0.1.85 |
| vsliveshare-pack | ms- | 0.3.4 |
| vscode-xml | red | 0.11.0 |
| vscode-yaml | red | 0.7.2 |
| crates | ser | 0.4.9 |
| vscode-hexdump | sle | 1.7.2 |
| markdown-all-in-one | yzh | 2.8.0 |