VSCode Version: 1.29.1 OS Version: Windows 10 / Ubuntu 16.04 Steps to Reproduce: git rebase a repo select more than one file with conflicts right click selected files and do "Accept all Incoming" or "Accept all Current" I would assume that this affects all selected files, not just one ...
You can check exactly what commands are run in the "Git" console, under the "Output" tab: In this case, VSCode doesn't runanyGit commands to accept both changes: it just removes the conflict markers by itself. Share Improve this answer ...
Type: Bug If git.useEditorAsCommitInput is true in vscode settings, on git commit a text editor is opened to author the commit message. To "accept" the commit message, there is a button on the top right of the editor linked to the comman...