Cannot commit merge commit when only my own changes are taken (no changed files)

[sanjom]

• VSCode Version: 1.45.1
• OS Version: Linux x64 5.3.0-53-generic snap (Ubuntu 18.04)

Steps to Reproduce:

1. In your code repository create a branch from master "test-branch" and make changes.
2. In master branch, make changes that would produce a merge conflict.
3. In "test-branch", use command line to "git merge master"
4. Resolve the conflict, taking my own changes ("mine") in all cases. This leaves no file changes.
5. Now I am unable to commit this merge commit using the VS Code UI, it works fine from the command line.

I assume the issue is, that since there are technically no changed files, this is not detected as a valid commit from the UI. However, since it is part of a merge process, committing should be possible.

Does this issue occur when all extensions are disabled?: Yes

[sanjom]

I just found #88034. Seems to be the same issue

[sanjom]

Also related: #7989

[sanjom]

Fixed by PR: #94021