SCM: Git merge changes don't stage if I accept current version

[matteobosc]

• VSCode Version: 1.28.0
• OS Version: Windows 10 Enterprise

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

The steps are the following:

1. A file has been modified on remote repository and I modify the same file on the local repository.

2. 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.

3. 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).

4. 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.

If there's a solution please reply also in the same Stack Overflow question, to help other people resolving this issue.

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

[vscodebot]

(Experimental duplicate detection)
Thanks for submitting this issue. Please also check if it is already covered by an existing one, like:

• staging file after resolving merge conflicts does not warn if file is not saved (#34175)
• Git: When resolving a merge conflict allow accepting the default commit message (#6403)
• Git integration fails to see merged file as staged if I reject all incoming edits (#7989)
• Git conflict resolution when remote file is deleted (#52787)

[joaomoreno]

/duplicate #60149

[vscodebot]

Thanks for creating this issue! We figured it's covering the same as another one we already have. Thus, we closed this one as a duplicate. You can search for existing issues here. See also our issue reporting guidelines.

Happy Coding!