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
For files with conflicts which vscode recognises (i.e. .py files) when I open the conflicted file it displays a bar at the top allow me to select the incoming changes or local changes. For all other files there doesn't seem to be any way to accept / reject changes even at the file...
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...