Vscode: Cannot compare changes for git conflicts after upgrade to 1.19

Created on 20 Dec 2017  路  4Comments  路  Source: microsoft/vscode
  • VSCode Version: Code 1.19.0 (816be6780ca8bd0ab80314e11478c48c70d09383, 2017-12-14T09:56:48.842Z)
  • OS Version: Linux x64 4.4.0-103-generic
  • Extensions:

Extension|Author (truncated)|Version
---|---|---
jest-snippets|and|1.0.4
vscode-eslint|dba|1.4.3
vscode-protractor-snippets|dee|1.0.5
tslint|eg2|1.0.24
vscode-cosmosdb|ms-|0.3.0
azure-account|ms-|0.2.2
debugger-for-chrome|msj|4.0.0
autoimport|ste|1.5.3
JasmineSnippets|xab|1.0.1


Reproduces without extensions: Yes

bug candidate merge-conflict verified
Source
picture tanmaybhatt
👍11

Most helpful comment

So, when you merge two branches on git, you see conflict in the source control section.

screenshot from 2017-12-21 10-55-01

Now when I click Compare changes on the conflict in the file, I get this error

screenshot from 2017-12-21 10-57-14

And it is happening with all my team members on version 1.19

picture tanmaybhatt on 21 Dec 2017
👍11

All 4 comments

Please provide steps how to reproduce.
What is the problem you are seeing?

weinand picture weinand on 20 Dec 2017

So, when you merge two branches on git, you see conflict in the source control section.

screenshot from 2017-12-21 10-55-01

Now when I click Compare changes on the conflict in the file, I get this error

screenshot from 2017-12-21 10-57-14

And it is happening with all my team members on version 1.19

tanmaybhatt picture tanmaybhatt on 21 Dec 2017
👍11

Also happens on Windows 10 x64 v1709 Build 16299.192 and VS Code v1.19.1.

ambroselittle picture ambroselittle on 8 Jan 2018
👍1

me2

atzex picture atzex on 18 Jan 2018
Was this page helpful?
0 / 5 - 0 ratings

Related issues

sijad picture sijad  路  3Comments
biij5698 picture biij5698  路  3Comments
villiv picture villiv  路  3Comments
v-pavanp picture v-pavanp  路  3Comments
sirius1024 picture sirius1024  路  3Comments