New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cannot compare changes for git conflicts after upgrade to 1.19 #40557

Closed
tanmaybhatt opened this Issue Dec 20, 2017 · 4 comments

Comments

Projects
None yet
7 participants
@tanmaybhatt

tanmaybhatt commented Dec 20, 2017

  • VSCode Version: Code 1.19.0 (816be67, 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

@weinand

This comment has been minimized.

Show comment
Hide comment
@weinand

weinand Dec 20, 2017

Member

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

Member

weinand commented Dec 20, 2017

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

@tanmaybhatt

This comment has been minimized.

Show comment
Hide comment
@tanmaybhatt

tanmaybhatt Dec 21, 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 commented Dec 21, 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

@joaomoreno joaomoreno assigned chrmarti and unassigned joaomoreno Dec 22, 2017

@chrmarti chrmarti added this to the December 2017/January 2018 milestone Jan 3, 2018

@ambroselittle

This comment has been minimized.

Show comment
Hide comment
@ambroselittle

ambroselittle Jan 8, 2018

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

ambroselittle commented Jan 8, 2018

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

@atzex

This comment has been minimized.

Show comment
Hide comment
@atzex

atzex commented Jan 18, 2018

#me2

@vscodebot vscodebot bot locked and limited conversation to collaborators Feb 24, 2018

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.