Can't resolve merge conflict in vscode-insiders

[Yuhi-Aoki]

Environment data

• VS Code version: 1.78.0-insider (Universal)
• Jupyter Extension version (available under the Extensions sidebar): v2023.4.1011172344
• Python Extension version (available under the Extensions sidebar): v2023.7.11111009
• OS (Windows | Mac | Linux distro) and version: Darwin x64 22.3.0
• Python and/or Anaconda version: 3.10.9
• Type of virtual environment used (N/A | venv | virtualenv | conda | ...): venv
• Jupyter server running: Local | Remote | N/A

Expected behaviour

open merge conflict editer, when click right-bottom green button

Actual behaviour

I can't open merge conflict editer

Steps to reproduce:

[NOTE: Self-contained, minimal reproducing code samples are extremely helpful and will expedite addressing your issue]

1. XXX

Logs

Output for Jupyter in the Output panel (View→Output, change the drop-down the upper-right of the Output panel to Jupyter)

XXX

[thoughtfuldata]

I am also having issues with merge conflicts when it comes notebooks. It just doesnt open at all. I get the when I try to use the merge editor

fatal: ambiguous argument 'MERGE_HEAD': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git [...] -- [...]'

[vancromy]

I am getting the same issue. In the Window Output pane I am getting this:

[error] [Extension Host] FAILED to read HEAD, MERGE_HEAD commits

And in the Git Output pane:

2023-08-25 10:54:54.649 [info] > git show -s --format=%H%n%aN%n%aE%n%at%n%ct%n%P%n%D%n%B -z MERGE_HEAD [8ms]
2023-08-25 10:54:54.649 [info] fatal: ambiguous argument 'MERGE_HEAD': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'

Which is getting triggered by these lines:

vscode/extensions/git/src/commands.ts

Lines 506 to 542 in 6c3e3db

	let isStashConflict = false;
	try {
	// Look at the conflict markers to check if this is a stash conflict
	const document = await workspace.openTextDocument(uri);
	const firstConflictInfo = findFirstConflictMarker(document);
	isStashConflict = firstConflictInfo?.incomingChangeLabel === 'Stashed changes';
	} catch (error) {
	console.error(error);
	}
	const current: InputData = { uri: mergeUris.ours, title: l10n.t('Current') };
	const incoming: InputData = { uri: mergeUris.theirs, title: l10n.t('Incoming') };
	if (isStashConflict) {
	incoming.title = l10n.t('Stashed Changes');
	}
	try {
	const [head, rebaseOrMergeHead] = await Promise.all([
	repo.getCommit('HEAD'),
	isRebasing ? repo.getCommit('REBASE_HEAD') : repo.getCommit('MERGE_HEAD')
	]);
	// ours (current branch and commit)
	current.detail = head.refNames.map(s => s.replace(/^HEAD ->/, '')).join(', ');
	current.description = '$(git-commit) ' + head.hash.substring(0, 7);
	current.uri = toGitUri(uri, head.hash);
	// theirs
	incoming.detail = rebaseOrMergeHead.refNames.join(', ');
	incoming.description = '$(git-commit) ' + rebaseOrMergeHead.hash.substring(0, 7);
	incoming.uri = toGitUri(uri, rebaseOrMergeHead.hash);
	} catch (error) {
	// not so bad, can continue with just uris
	console.error('FAILED to read HEAD, MERGE_HEAD commits');
	console.error(error);
	}

In my specific case I am popping a stash and getting a merge conflict which AFAIK does not create a MERGE_HEAD ref so it cannot be found and as such the merge editor open command never gets called since it errors out before that. This may be an issue with VSCode rather than VSCode jupyter?

I had to revert to just resolving merge conflicts via the raw notebook (JSON) view.

[TomashA1980]

same problem with 1.85 version VSC on Ubuntu

[conradwt]

I'm also seeing the same issue with VSCode - Insiders 1.88.0-insider (Universal) on macOS 14.3.1.

[DonJayamanne]

This should now be fixed,
Please feel free to ping here or create a new issue if this problem persists.