Description
Type: Bug
I have a huge codebase that require explicit reviewing in order to update to latest changes fro upstream repo. However, during review change using merge editor, with file autosave enabled, causes all changes to always "accept current".
This results in all incoming changes to be missing. It also makes all result changes to be required to perform "manual resolution", but the panel status shows 0 conflicts remaining.
I also tried to perform a reset everything in a file by clicking the "reset" button in result pane, not the "reset to base" action for each changes. However, after file is autosaved, it accept changes from current change again.
I'm unsure if this is reproducible, but here is the detailed steps when I tried this.
- Open the codebase
- Ensure autosave is enabled via command palette using "Toggle Autosave" settings.
- Pull changes from upstream repository using terminal
git pull upstream master - Wait for pull changes to recognize conflicts
- Open merge conflicted files from "Source Control" side menu
- All changes conform to "accept current" result pane after the file is autosaved
Disabling file autosave partially resolve this, but there are still changes that was resolved by itself
VS Code version: Code 1.100.3 (258e40f, 2025-06-02T13:30:54.273Z)
OS version: Windows_NT x64 10.0.19045
Modes:
System Info
| Item | Value |
|---|---|
| CPUs | 11th Gen Intel(R) Core(TM) i5-11400 @ 2.60GHz (12 x 2592) |
| 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) | 15.60GB (7.50GB free) |
| Process Argv | . --crash-reporter-id 5ce28e05-c46f-4124-b28c-49b5f5ac651f |
| Screen Reader | no |
| VM | 0% |
Extensions (23)
| Extension | Author (truncated) | Version |
|---|---|---|
| emojisense | bie | 0.10.0 |
| github-markdown-preview | bie | 0.3.0 |
| markdown-checkbox | bie | 0.4.0 |
| markdown-emoji | bie | 0.3.1 |
| markdown-footnotes | bie | 0.1.1 |
| markdown-mermaid | bie | 1.28.0 |
| markdown-preview-github-styles | bie | 2.1.0 |
| markdown-yaml-preamble | bie | 0.1.0 |
| vscode-better-align | cho | 1.4.2 |
| path-intellisense | chr | 2.10.0 |
| regex | chr | 0.5.1 |
| hex-to-rgba | dak | 1.0.0 |
| mass-renamer | eve | 0.0.4 |
| batch-rename-extension | Jan | 0.0.6 |
| json-table-viewer | len | 0.0.5 |
| compare-folders | mos | 0.25.1 |
| sqltools | mtx | 0.28.4 |
| sqltools-driver-mysql | mtx | 0.6.4 |
| vscode-data-preview | Ran | 2.3.0 |
| htmlescape-vscode-extension | ray | 0.0.7 |
| vscode-xml | red | 0.29.0 |
| in-any-case | wil | 2.0.0 |
| vscode-markdown-alert | yah | 0.0.4 |
(5 theme extensions excluded)