sometime diff can not load

Type: Bug

sometime file diff can not load

if pr have conflict then accept current changes and or incoming changes button not visible

VS Code version: Code 1.129.0 (Universal) (125df4672b8a6a34975303c6b0baa124e560a4f7, 2026-07-15T00:08:44Z)
OS version: Darwin arm64 25.5.0
Modes:

System Info

|Item|Value|
|---|---|
|CPUs|Apple M1 Pro (8 x 2400)|
|GPU Status|2d_canvas: enabled
GPU0: VENDOR= 0x106b [Google Inc. (Apple)], DEVICE=0x0000 [ANGLE (Apple, ANGLE Metal Renderer: Apple M1 Pro, Version 26.5 (Build 25F71))], DRIVER_VENDOR=Apple, DRIVER_VERSION=26.5 *ACTIVE*
Machine model name: MacBookPro
Machine model version: 18.3
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: enabled_on
trees_in_viz: disabled_off
video_decode: enabled
video_encode: enabled
webgl: enabled
webgpu: enabled
webnn: disabled_off|
|Load (avg)|10, 8, 8|
|Memory (System)|16.00GB (0.11GB free)|
|Process Argv|--crash-reporter-id b9e9de42-81e4-4e07-9ba5-6027eb41ee38|
|Screen Reader|no|
|VM|0%|
Extensions (18)

Name|Identifier|Author|Version
---|---|---|---
Goto definition alias|antfu.goto-alias|antfu|1.0.0
GitLens — Git supercharged|eamodio.gitlens|eamodio|18.3.0
Prettier - Code formatter|esbenp.prettier-vscode|esbenp|12.4.0
Go|golang.go|golang|0.56.0
CursorCode(Cursor for VSCode)|meteorstudio.cursorcode|meteorstudio|0.2.1
autopep8|ms-python.autopep8|ms-python|2026.4.0
Python Debugger|ms-python.debugpy|ms-python|2026.6.0
Python|ms-python.python|ms-python|2026.4.0
Pylance|ms-python.vscode-pylance|ms-python|2026.3.1
Python Environments|ms-python.vscode-python-envs|ms-python|1.36.0
autoDocstring - Python Docstring Generator|njpwerner.autodocstring|njpwerner|0.6.1
Codex – OpenAI’s coding agent|openai.chatgpt|openai|26.5721.30844
Protobuf support|peterj.proto|peterj|0.0.4
vscode-proto|sankethdev.vscode-proto|sankethdev|0.0.6
Refact – Open-Source AI Agent, Code Generator & Chat for JavaScript, Python, TypeScript, Java, PHP, Go, and more.|smallcloud.codify|smallcloud|8.4.1
Code Spell Checker|streetsidesoftware.code-spell-checker|streetsidesoftware|4.5.6
Cursor AI|vbrocket.cursor-ai|vbrocket|0.2.0
IntelliSense for CSS class names in HTML|zignd.html-css-class-completion|Zignd|1.20.0

A/B Experiments

```
vsliv368cf:30146710
binariesv615:30325510
nativeloc1:31344060
dwcopilot:31170013
dwoutputs:31242946
copilot_t_ci:31333650
e5gg6876:31282496
pythonrdcb7:31342333
6518g693:31463988
aj953862:31281341
envsactivate1:31551504
gh487529:31544284
cloudbuttont:31379625
3efgi100_wstrepl:31403338
ddidtcf:31399634
ec5jj548:31422691
cp_cls_t_966_ss:31526232
c3h7c220:31478652
cp_cls_t_1081:31454832
conptydll_true:31498968
e9c30283:31461165
test_treatment2:31471001
c9b86496:31447327
capico_a_098a3278:31555650
idci7584:31464702
e3e4d672:31494082
ei9d7968:31496641
chat:31457767
8hig5102:31480529
89g7j272:31518289
7e187181:31503455
i2gc6536:31499202
52612955:31516516
ghj88844:31499326
ec1eg703:31520046
ddid_t:31478206
hmra_i5g22:31518061
7df3h592:31512476
cp_cls_t_1082:31535311
logging_enabled_new:31498466
db5d2638:31499441
jb_cp_cls_t_632:31543129
56dj4588:31512888
32d76977:31512328
ha629193:31508444
cdk-lw-on:31524445
f9bf7985:31543584
a1ije391_t:31540920
41836166:31537719
jbcp_cls_pctr_t:31531130
61138546:31518536
cp_intellij_t_nes:31548657
jf4hg949:31526829
nes-curr-leftover-1500:31538366
8hjh2968:31555644
h561g132:31533256
sessions_5:31532894
ihg5j128:31534457
f412h606:31551416
9gg7f176:31542112
sandbox-ui-on-2:31543161
nes-ex-cf-euporie-03:31542868
allow-none:31555437
fd5dc207:31551400
nes-gb2-ctrl:31554343
0dg73464:31554319
d4c76da2:31554780
treatment-23-1:31555779
unuse_dynamic_mcp:31555281

```