Why are the conflict resolution buttons reversed. #238260
Open
Description
Type: Bug
- Try to merge a conflict file
- In the editor, the order of the buttons is Accept Current Change | Accept Incoming Change |.
- In the Resolve in Merge Editor, the left window is Incoming and the right window is Current.
Why create two opposite logics
VS Code version: Code 1.96.2 (Universal) (fabdb6a, 2024-12-19T10:22:47.216Z)
OS version: Darwin arm64 23.6.0
Modes:
Remote OS version: Linux x64 5.15.0-130-generic
System Info
| Item | Value |
|---|---|
| CPUs | Apple M2 (8 x 2400) |
| 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 webgl: enabled webgl2: enabled webgpu: enabled webnn: disabled_off |
| Load (avg) | 3, 3, 3 |
| Memory (System) | 16.00GB (0.08GB free) |
| Process Argv | --crash-reporter-id 83ca7027-1d6e-4266-96b4-3e1a93019c10 |
| Screen Reader | no |
| VM | 0% |
| Item | Value |
|---|---|
| Remote | SSH: 192.168.20.58 |
| OS | Linux x64 5.15.0-130-generic |
| CPUs | Intel(R) Core(TM) i7-10700 CPU @ 2.90GHz (16 x 799) |
| Memory (System) | 15.36GB (11.53GB free) |
| VM | 0% |
Extensions (9)
| Extension | Author (truncated) | Version |
|---|---|---|
| gitlens | eam | 16.1.1 |
| copilot | Git | 1.256.0 |
| copilot-chat | Git | 0.23.2 |
| git-graph | mhu | 1.30.0 |
| indent-rainbow | ode | 8.3.1 |
| remote-ssh | ms- | 0.116.1 |
| remote-ssh-edit | ms- | 0.87.0 |
| remote-explorer | ms- | 0.4.3 |
| material-icon-theme | PKi | 5.16.0 |
(2 theme extensions excluded)
A/B Experiments
vsliv368:30146709
vspor879:30202332
vspor708:30202333
vspor363:30204092
vscod805cf:30301675
binariesv615:30325510
vsaa593:30376534
py29gd2263:31024239
c4g48928:30535728
azure-dev_surveyone:30548225
2i9eh265:30646982
962ge761:30959799
pythonnoceb:30805159
pythonmypyd1:30879173
h48ei257:31000450
pythontbext0:30879054
cppperfnew:31000557
dsvsc020:30976470
pythonait:31006305
dsvsc021:30996838
dvdeprecation:31068756
dwnewjupyter:31046869
2f103344:31071589
nativerepl1:31139838
pythonrstrctxt:31112756
nativeloc2:31192216
cf971741:31144450
iacca1:31171482
notype1cf:31157160
5fd0e150:31155592
dwcopilot:31170013
stablechunks:31184530
6074i472:31201624
dwoutputs:31217127
Metadata
Assignees
Labels
No labels