Skip to content

Fix last merge conflict warnings when enable autoNavigateNextConflict#62788

Merged
chrmarti merged 1 commit intomicrosoft:masterfrom
laphets:fix-last-merge-conflict
Nov 30, 2018
Merged

Fix last merge conflict warnings when enable autoNavigateNextConflict#62788
chrmarti merged 1 commit intomicrosoft:masterfrom
laphets:fix-last-merge-conflict

Conversation

@laphets
Copy link
Contributor

@laphets 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 fix-last-merge-conflict branch from e6cf60e to 0b76769 Compare November 8, 2018 15:55
@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
@chrmarti
Copy link
Collaborator

Thanks! @laphets

@github-actions github-actions bot locked and limited conversation to collaborators Mar 27, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Warning is shown after automatically navigating from last merge conflict

2 participants