Not able to commit/stage/resolve merge conflicts

[mpuri18]

Type: Bug

Try clicking on resolve merge conflicts, or clicking on '+' to stage or trying to hit the commit button, nothing seems to work and endless loading starts.

VS Code version: Code 1.100.2 (848b80a, 2025-05-14T21:47:40.416Z)
OS version: Windows_NT x64 10.0.26100
Modes:

Extensions (17)

Extension	Author (truncated)	Version
apex-pmd	chu	0.8.0
lana	Fin	1.16.1
copilot	Git	1.323.0
copilot-chat	Git	0.27.2
salesforce-vscode-slds	sal	2.0.12
salesforcedx-einstein-gpt	sal	2.7.0
salesforcedx-vscode	sal	63.14.1
salesforcedx-vscode-apex	sal	63.14.1
salesforcedx-vscode-apex-debugger	sal	63.14.1
salesforcedx-vscode-apex-replay-debugger	sal	63.14.1
salesforcedx-vscode-core	sal	63.14.1
salesforcedx-vscode-lightning	sal	63.14.1
salesforcedx-vscode-lwc	sal	63.14.1
salesforcedx-vscode-soql	sal	63.14.1
salesforcedx-vscode-visualforce	sal	63.14.1
sfdx-code-analyzer-vscode	sal	1.6.1
sfdx-package-xml-generator	Vig	2.1.0

A/B Experiments

vsliv368cf:30146710
vspor879:30202332
vspor708:30202333
vspor363:30204092
vscod805:30301674
binariesv615:30325510
c4g48928:30535728
azure-dev_surveyone:30548225
vscrp:30673768
2i9eh265:30646982
962ge761:30959799
f8hc8238:30694864
h48ei257:31000450
pythontbext0:30879054
cppperfnew:31000557
dwnewjupyter:31046869
pythonrstrctxt:31112756
nativeloc2:31192216
5fd0e150:31155592
dwcopilot:31170013
6074i472:31201624
dwoutputs:31242946
customenabled:31248079
hdaa2157:31222309
copilot_t_ci:31222730
e5gg6876:31282496
pythoneinst12:31285622
bgtreat:31268568
4gafe986:31271826
c7cif404:31309971
996jf627:31283433
pythonrdcb7:31303018
usemplatestapi:31297334
0aa6g176:31307128
7bj51361:31289155
747dc170:31275177
pylancecolorcf:31309109
aj953862:31281341
generatesymbolt:31295002
convertfstringf:31295003
gendocf:31295004

[mpuri18]

This was resolved by Itself. Not sure what caused it. Maybe the number of too many files.

[lszomoru]

@mpuri18, thanks for the update. In case you are still able to reproduce the issue please reopen it.