chore: backport fixes from rebase dialog to merge dialog#7151
Merged
niik merged 3 commits intodesktop:developmentfrom Apr 1, 2019
vhashimotoo:merge-conflicts-backport-fixes
Merged
chore: backport fixes from rebase dialog to merge dialog#7151niik merged 3 commits intodesktop:developmentfrom vhashimotoo:merge-conflicts-backport-fixes
niik merged 3 commits intodesktop:developmentfrom
vhashimotoo:merge-conflicts-backport-fixes
Conversation
Contributor
|
Hi @HashimotoYT, sorry for the delay! Should I mark this |
niik
requested changes
Mar 28, 2019
Member
niik
left a comment
There was a problem hiding this comment.
Hey @HashimotoYT, thanks so much for opening this and helping us backport these changes! I left two small comments that I'd appreciate if you could take a look at.
Contributor
Author
|
@niik changes made. |
niik
approved these changes
Apr 1, 2019
Member
|
Thank you @HashimotoYT! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Overview
Closes #7043
Description
Release notes
Notes: no-notes