Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Git conflict highlighting can get messed up easily #66

Closed
Tyriar opened this issue Nov 18, 2015 · 2 comments
Closed

Git conflict highlighting can get messed up easily #66

Tyriar opened this issue Nov 18, 2015 · 2 comments
Assignees
@joaomoreno
Labels
bug Issue identified by VS Code Team member as probable bug verified Verification succeeded
Milestone
Feb 2016

Comments

@Tyriar
Copy link
Member

Tyriar commented Nov 18, 2015

Ubuntu 12.04, vscode 0.10.1

Deleting and undoing the line doubles the highlight: (stays after closing and reopening the file)

highlight1

Deleting from the end of the line above the ======= to the end of the line starting with >>>>>>>:

highlight3

Undoing the above results in this:

highlight2
@joaomoreno joaomoreno self-assigned this Nov 18, 2015
@joaomoreno joaomoreno mentioned this issue Dec 2, 2015
Closed
@egamma egamma modified the milestone: Backlog Dec 10, 2015
@joaomoreno joaomoreno modified the milestones: March 2016, Backlog Feb 22, 2016
@joaomoreno joaomoreno mentioned this issue Feb 22, 2016
Closed
@alexdima alexdima modified the milestones: Feb 2016, March 2016 Feb 22, 2016
@joaomoreno
Copy link
Member

Thanks!

@Tyriar
Copy link
Member Author

Tyriar commented Feb 22, 2016

👍

This was referenced Feb 23, 2016
Closed
Closed
@joaomoreno joaomoreno added bug Issue identified by VS Code Team member as probable bug verified Verification succeeded labels Feb 26, 2016
@NoHomey NoHomey mentioned this issue Oct 26, 2016
Closed
@NoHomey NoHomey mentioned this issue Nov 5, 2016
Closed
@basickarl basickarl mentioned this issue Dec 12, 2016
Closed
@vscodebot vscodebot bot locked and limited conversation to collaborators Nov 18, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@joaomoreno joaomoreno

Labels
bug Issue identified by VS Code Team member as probable bug verified Verification succeeded
Projects
None yet
Milestone
Feb 2016
Development

No branches or pull requests
4 participants
@joaomoreno @egamma @Tyriar @alexdima