Skip to content

Add next/prev conflicts #97613

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
Merged
merged 5 commits into from
Mar 31, 2021
Merged

Add next/prev conflicts #97613

merged 5 commits into from
Mar 31, 2021

Conversation

Kingwl
Copy link
Contributor

@Kingwl Kingwl commented May 12, 2020

This PR fixes #38321

There's an existed pr #47884 but not updated about 2 years

@chrmarti chrmarti added this to the May 2020 milestone May 12, 2020
@chrmarti chrmarti modified the milestones: May 2020, June 2020 Jun 4, 2020
@mckeed mckeed mentioned this pull request Jul 1, 2020
Open
@chrmarti chrmarti modified the milestones: June 2020, July 2020 Jul 2, 2020
@chrmarti chrmarti modified the milestones: July 2020, August 2020 Aug 4, 2020
@chrmarti chrmarti modified the milestones: August 2020, September 2020 Sep 3, 2020
@Kingwl
Copy link
Contributor Author

Kingwl commented Sep 18, 2020 •
edited
Loading

Well... Any update?
I have to press ctrl + p -> > -> next many times in these months.

@chrmarti chrmarti modified the milestones: September 2020, October 2020 Oct 1, 2020
@chrmarti chrmarti modified the milestones: October 2020, November 2020 Oct 30, 2020
@Kingwl
Copy link
Contributor Author

Kingwl commented Nov 9, 2020

u'p

@chrmarti chrmarti modified the milestones: January 2021, February 2021 Jan 26, 2021
@joaomoreno joaomoreno changed the base branch from master to main February 15, 2021 08:51
@chrmarti chrmarti modified the milestones: February 2021, March 2021 Feb 19, 2021
@chrmarti chrmarti removed this from the March 2021 milestone Mar 24, 2021
@chrmarti chrmarti added this to the April 2021 milestone Mar 24, 2021
@Kingwl
Copy link
Contributor Author

Kingwl commented Mar 31, 2021

Well....

@chrmarti chrmarti merged commit 96d0dc4 into microsoft:main Mar 31, 2021
@chrmarti
Copy link
Collaborator

Thanks!

chrmarti added a commit that referenced this pull request Mar 31, 2021
@chrmarti
Add next/prev conflicts (#97613)
5c79571
@Kingwl Kingwl deleted the next-conflict branch March 31, 2021 09:22
@github-actions github-actions bot locked and limited conversation to collaborators May 15, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@chrmarti chrmarti

Labels
None yet
Projects
None yet
Milestone
April 2021
Development

Successfully merging this pull request may close these issues.

Git: Provide navigation through git merge conflicts
2 participants
@Kingwl @chrmarti