Visual Studio Code doesn't stage Git merge changes

Question

Using Git as a source control provider in Visual Studio Code I have an issue whenever I try to merge a conflict file with remote repository keeping my current version.

The steps are the following:

• A file has been modified on remote repository and I modify the same file on the local repository
• When I try to push my changes to the server I recieve (correctly) an error message (no-fast-forward) and I must perform a pull to update my local repository
• When pulling, the editor warn me about the conflict on the file, giving me four option (Accept Current Change, Accept Incoming Change, Accept Both Changes, Compare Changes)
• I accept the current change (my local version) and save the file. When I try to stage the change the file is not added to the section STAGED CHANGES but it disappears. Git remain in a "merging" status and I can't do anything (a push gives me the same error of the first push and a pull gives me an error like I didn't resolved the conflict; in fact in the .git folder I still have the MERGE_HEAD file)

If I Accept the Incoming Change, Accept Both Changes or add additional chars to my previous version (to change the version I tried to commit before) everything works fine. I think that when I choose "Accept Current Change" and try to stage merge changes the editor (or Git?) doesn't add the file to the STAGED CHANGES because it's identical to the version previously committed, and doesn't update the git status, that remains stuck in merge conflict.

The workaround of adding additional chars to the previous version when merging works fine, but I need to know if it's a bug or I'm missing some steps when merging.

Please don't reply me with command line workaround (like git merge --abort), I'm looking for a UI friendly solution (not all of my team mates are confident with command line). Thanks in advance.

Answer 1

This was a bug in Visual Studio Code which has been fixed in commit 578d7381da3e9d559e9326375b67429a5de3027d and was shipped in November 2020 with version 1.52.0 of VS Code.