Resolve Conflicts doesn’t open in VS Code Desktop with a GitHub Remote Repository

Aberta
  • Algo errado?
#9,158 1 comentário 0 reações 1 responsável Ver no GitHub

Mantenedores costumam responder em até 1 dia

@alexr00 já está trabalhando nisso.

Desde 3/11/2026.

Avaliação

Esta issue ainda não foi avaliada.

Descrição

Description

When I open a repository in VS Code Desktop using the GitHub Repositories extension, the GitHub Pull Requests extension displays the Resolve Conflicts button for a pull request with merge conflicts. However, selecting the button briefly displays a notification that disappears, and the conflict-resolution UI never opens.

The same pull request can be resolved successfully in these scenarios:

  • In vscode.dev using the remote repository

  • In VS Code Desktop when the repository is cloned and opened locally

The issue appears to be specific to using a GitHub Remote Repository in VS Code Desktop. I have tested in both stable and insiders versions of VS Code as well as stable and insiders versions of the PR extension.

Expected behavior: Selecting Resolve Conflicts opens the conflict-resolution UI.

Actual behavior: A notification briefly appears, but no conflict-resolution UI opens. Then the Resolve Conflicts button is disabled until you close and reopen the extension.

This scenario is required by an internally used Microsoft extension. Please let me know what additional diagnostic information would help. Microsoft employees can also contact dmartens with questions.

Issue Details
Item Value
Issue Category Bug
Target GitHub Pull Requests
Repository Microsoft/vscode-pull-request-github
VS Code Version Code 1.144.1 (261c84cb1eddf11235f9e2c921425e9663fbe556, 2026-11-01T07:37:53-08:00)
OS Version Windows_NT arm64 10.0.26300
Extension Identifier github.vscode-pull-request-github
Extension Version 0.174.0
Extension Publisher GitHub
System Info
Item Value
VS Code Version Code 1.144.1 (261c84cb1eddf11235f9e2c921425e9663fbe556, 2026-11-01T07:37:53-08:00)
OS Version Windows_NT arm64 10.0.26300
CPUs Snapdragon(R) X 12-core X1E80100 @ 3.40 GHz (12 x 2974)
GPU Status 2d_canvas: enabled
GPU0: VENDOR= 0x4d4f4351, DEVICE=0x36334330 [Qualcomm(R) Adreno(TM) X1-85 GPU], DRIVER_VENDOR=Qualcomm, DRIVER_VERSION=31.0.133.1 ACTIVE
GPU1: VENDOR= 0x1414, DEVICE=0x008c [Microsoft Basic Render Driver], DRIVER_VERSION=10.0.26100.9711
Machine model name:
Machine model version:
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: unavailable_off
trees_in_viz: disabled_off
video_decode: enabled
video_encode: enabled
webgl: enabled
webgpu: enabled
webnn: disabled_off
Load (avg)
Memory (System) 63.49GB (19.11GB free)
Process Argv --crash-reporter-id 636ce3f5-e8ff-48a0-8b7d-a6e5bb130d2d
Screen Reader no
VM 0%
User Agent Mozilla/5.0 (Windows NT 10.0) AppleWebKit/537.36 (KHTML, like Gecko) Code/1.144.1 Chrome/150.0.7871.250 Electron/43.8.3 Safari/537.36
Installation pure true
A/B Experiments 
vsliv368:30146709
vswsl492:30256859
binariesv615:30325510
nativeloc1:31344060
dwcopilot:31170013
dwoutputs:31242946
copilot_t_ci:31333650
e5gg6876:31282496
pythonrdcb7:31342333
6518g693:31463988
aj953862:31281341
b6b4d950:31327385
envsactivate1:31551504
cloudbuttont:31379625
3efgi100_wstrepl:31403338
ec5jj548:31422691
cmp-cht-diffpatch-3in1-pandia-25-2:31606657
metis_rerank_treatment1:31422731
cp_cls_t_966_ss:31526232
4je02754:31466945
c3h7c220:31478652
ge8j1254_inline_auto_hint_haiku:31490510
cp_cls_c_1081:31454833
conptydll_true:31498968
e9c30283:31461165
46204921:31447328
ei9d7968:31496641
chat:31457767
8hig5102:31480529
89g7j272:31518289
2d1bi976:31596492
i2gc6536:31499202
52612955:31516516
23c7c724:31520045
ddid_t:31478206
hmra_i5g22:-9
7df3h592:31512476
cp_cls_t_1082:31535311
logging_enabled_new:31498466
j0d79568:31499440
jb_cp_cls_t_632:31543129
56dj4588:31512888
32d76977:31512328
ha629193:31508444
jh5f2457_c:31540921
jbcp_cls_pctr_t:31531130
3f904173:31522231
cp_intellij_t_nes:31548657
ahp-both-windows:31556933
ihg5j128:31534457
7g2b5551:31542111
enable_editor_pane_layout:31569726
allow-none:31555437
ac562147:31564510
voicemodeon:31566387
1h923230:31564177
gpt61sol_default:31600754
treatment-23-1:31555779
unuse_dynamic_mcp:31555281
0d8dfbc3:31570291
a1hcc538:31559322
nemo-v2:31565332
0c1h4866:31566224
session-mark-done:31591648
plus-and-new:31592472
multi-root:31593626
5b8j3302:31564601
autotiers:31581918
mangle-name-treatment:31572634
allow-signed-out:31592042
b17abb00-cfec-4134-90da-ee5e32ce4426:31602001
intellij_nes_preview_t:31580086
39a5d156:31574986
luna_v2:31593978
enable-sandbox:31606596
aw-autom-on:31583758
issue9151-8b8b39eb:31593979
usage_tips_endabled_0911:31587631
7g328426_fixed:31595622
codex-agent-host-stable-editor:31599810
54hd3363:31600021
skill-budget-30000:31597277
welcomesignin9359t:31602106
e6882f69-f5cc-4f90-9073-69a4ca3e50ea:31602109
d6a5dc66-a24d-4215-bf31-317b28ac768a:31603712
0915b77b-4632-4fb2-9377-b5640c1e9623:31606574
5a177259:31599157
i67i8290:31599156
edbgf432:31599155
2b2dee84:31605428
msft-auth-on:31593345
b7df2898:31597436
codex-continuation-control:31605233
variation6-agent-feedback:31600295
early-preparation-enabled:31606591
permission_prompt_treatment:1294978
ccr_pr_nudge_auto_review:1467214
vsc_wsm_t:1340632
1g5a5742:1379227
jc553158:1433349
5i7gb129:1438750
cmc_aa_c:1435710
canvases-enabled:1468148
c_ws_f8jhi663:1455089
seatcta-d9cadb09:1462477
g1gbf332:1482370
st_ar_264dh868:1460017
stb_t_959c6463:1455227
ghuitreatment2:1482850
prewarm_control:1478569
ctid-aa-t:1469309
recommendations-treatment:1474431
titlebar-rich-hover-many-windows-to-one:1479477
welcome-agents-window-graphic-none:1479480
parallel-banner-manage-reveal:1479488
Attachments

https://github.com/user-attachments/assets/ee94cb45-1c6f-4cc5-86f4-db702d0b97a9

Linguagem predominante
TypeScript
Estrelas
2.6k
Forks
811
Merge médio
1d 9h
PRs com merge (30d)
69

Preparar o ambiente

Este projeto não oferece contêiner de desenvolvimento, Dockerfile nem guia de contribuição, então a configuração fica por sua conta: comece pelo README e veja nosso guia da primeira contribuição para os passos gerais.

Primeiros passos

  1. Leia a issue inteira e depois o guia de contribuição do projeto.
  2. Comente na issue dizendo que vai assumir — evita que duas pessoas façam o mesmo trabalho.
  3. Faça um fork do repositório e trabalhe em uma branch.
  4. Abra um pull request que referencie o número da issue.

Mais de microsoft/vscode-pull-request-github

Todas as issues de microsoft/vscode-pull-request-github

Issues semelhantes

Mais issues de TypeScript

Receba novas issues na sua caixa de entrada

Um resumo curto de issues do GitHub para quem está começando.