Stuck on an issue?

Lightrun Answers was designed to reduce the constant googling that comes with debugging 3rd party libraries. It collects links to all the places you might be looking at while hunting down a tough bug.

And, if you’re still stuck at the end, we’re happy to hop on a call to see how we can help out.

Unable to commit merge conflict resolution from Source Control tab

See original GitHub issue

Issue Type: Bug

Merged the develop branch into a feature branch to get it up to date. A few conflicts were identified. I resolved the using the VSCode editor window. Using the Source Control tab, I attempted to moved files from “MERGED” to “CHANGES” using the “+” button. The files disappeared from the Merged list, but did not appear in the Changes list. Once all were resolved, it showed the “SYNC” button, but the “COMMIT” button did not appear. Trying to sync threw up an error that the merge was in progress (“MERGE_HEAD exists”), but no files were showing as having been updated or ready to commit.

If it matters, there are multiple source control repositories in this workspace, but I was definitely using the correct one. I’ve seen issues similar to this in the past with merging, but has usually allowed me to create an empty commit which resolves the issue. This time, no such option was available.

VS Code version: Code 1.69.2 (3b889b090b5ad5793f524b5d1d39fda662b96a2a, 2022-07-18T16:32:39.000Z) OS version: Darwin arm64 21.3.0 Restricted Mode: No

System Info

Item	Value
CPUs	Apple M1 Pro (10 x 24)
GPU Status	2d_canvas: enabled canvas_oop_rasterization: disabled_off direct_rendering_display_compositor: disabled_off_ok gpu_compositing: enabled metal: disabled_off multiple_raster_threads: enabled_on opengl: enabled_on rasterization: enabled raw_draw: disabled_off_ok skia_renderer: enabled_on video_decode: enabled video_encode: enabled webgl: enabled webgl2: enabled
Load (avg)	3, 3, 3
Memory (System)	16.00GB (0.07GB free)
Process Argv	–crash-reporter-id 098a425a-5690-419b-b4ca-77b7ad0365f3
Screen Reader	no
VM	0%

Extensions (28)

Extension	Author (truncated)	Version
better-comments	aar	3.0.0
atlascode	atl	2.10.12
vscode-mac-color-picker	dae	1.1.0
vscode-markdownlint	Dav	0.47.0
vscode-eslint	dba	2.2.6
gitlens	eam	12.1.2
vscode-great-icons	emm	2.1.86
prettier-vscode	esb	9.5.0
vscode-pull-request-github	Git	0.46.1
vscode-fast-folder-structure	Huu	3.8.1
plantuml	jeb	2.17.3
solidity	Jua	0.0.139
git-graph	mhu	1.30.0
dotenv	mik	1.0.1
live-server	ms-	0.2.12
vsliveshare	ms-	1.0.5667
vsliveshare-audio	ms-	0.1.91
color-highlight	nau	2.5.0
vscode-jest	Ort	4.6.0
vscode-yaml	red	1.9.1
code-spell-checker	str	2.3.3
svelte-vscode	sve	105.20.0
graphviz-interactive-preview	tin	0.3.1
solidity-visual-auditor	tin	0.1.3
vscode-ethover	tin	0.0.7
vscode-inline-bookmarks	tin	0.0.27
vscode-solidity-flattener	tin	0.0.11
vscode-solidity-language	tin	0.0.6

(1 theme extensions excluded)

A/B Experiments

vsliv368cf:30146710
vsreu685:30147344
python383cf:30185419
vspor879:30202332
vspor708:30202333
vspor363:30204092
vslsvsres303:30308271
pythonvspyl392:30443607
vserr242cf:30382550
pythontb:30283811
vsjup518:30340749
pythonptprofiler:30281270
vsdfh931:30280409
vshan820:30294714
vstes263cf:30335440
pythondataviewer:30285071
vscod805cf:30301675
binariesv615:30325510
bridge0708:30335490
bridge0723:30353136
vsaa593cf:30376535
vsc1dst:30438360
pythonvs932:30410667
wslgetstarted:30449410
vscscmwlcmt:30465135
cppdebug:30492333
vscaat:30438848
pylanb8912cf:30529770
vsclangdc:30486549
c4g48928:30535728