Fixes #21251 #27628
Merged
Fixes #21251 #27628
Conversation
This file contains 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
|
Can you update the baselines with |
|
|
|
That did it, thanks! |
RyanCavanaugh
approved these changes
Jan 24, 2019
There was a problem hiding this comment.
@ely-alamillo can you please address the merge conflicts? We can merge once that's taken care of. Thanks!
|
@RyanCavanaugh would this be resolved by pulling from master and updating the baselines after that ? |
|
@ely-alamillo generally it's easiest to pull from master, take whichever side from the merge conflict, rerun the tests, re-accept the baselines, and commit the result. That should get you in a good state |
|
@RyanCavanaugh there we go! Thanks for the help. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Provides a better error message that is not misleading to the user as discussed here