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

Fix last merge conflict warnings when enable autoNavigateNextConflict #62788

Merged
merged 1 commit into from Nov 30, 2018

Conversation

Projects
None yet
2 participants
@laphets
Copy link
Contributor

laphets commented Nov 8, 2018

Fix #62385

@laphets laphets changed the title Fix last merge conflict warnings Fix last merge conflict warnings when enable autoNavigateNextConflict Nov 8, 2018

@laphets laphets force-pushed the laphets:fix-last-merge-conflict branch from e6cf60e to 0b76769 Nov 8, 2018

@chrmarti chrmarti self-assigned this Nov 9, 2018

@chrmarti chrmarti added this to the November 2018 milestone Nov 9, 2018

@chrmarti chrmarti merged commit 2e339af into Microsoft:master Nov 30, 2018

1 of 2 checks passed

VS Code #20181108.30 failed
Details
license/cla All CLA requirements met.
@chrmarti

This comment has been minimized.

Copy link
Contributor

chrmarti commented Nov 30, 2018

Thanks! @laphets

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