[Bug] Git merge conflict resolution prompt uses incorrect default option
Status Fixed / completed
Reported on v2.1.282
Maintainer reply None cached
Activity 0 comments · opened Oct 12, 2026 · closed Oct 12, 2026
Bug Description
Correction to my earlier report about the git merge that deleted my .env: my choice should have been 2, not 0.
Environment Info
- Platform: win32
- Terminal: vscode
- Version: 2.1.282
- Feedback ID: 9e28af30-67f0-4422-bec6-336896a9f84e
Errors
[{"error":"TelemetrySafeError: VirtualMessageList: itemKeys/messages length desync (keys=303 messages=302 range=[275,303))\n at JT (B:/~BUN/root/chunk-g7jdt38v.js:24:29548)\n at Lc (B:/~BUN/root/chunk-g7jdt38v.js:24:20742)\n at $s (B:/~BUN/root/chunk-d8z63naw.js:18:20331)\n at yu (B:/~BUN/root/chunk-d8z63naw.js:18:38498)\n at Qh (B:/~BUN/root/chunk-d8z63naw.js:18:84581)\n at fb (B:/~BUN/root/chunk-d8z63naw.js:18:83581)\n at zu (B:/~BUN/root/chunk-d8z63naw.js:18:83410)\n at Kh (B:/~BUN/root/chunk-d8z63naw.js:18:79934)\n at mt (B:/~BUN/root/chunk-d8z63naw.js:18:6261)\n at ei (B:/~BUN/root/chunk-d8z63naw.js:18:4792)","timestamp":"2026-10-12T06:37:16.934Z"}]