Update baseline to resolve file conflicts with nanovg and stb#9559
Closed
JackBoosY wants to merge 2 commits intomicrosoft:masterfrom
Closed
Update baseline to resolve file conflicts with nanovg and stb#9559JackBoosY wants to merge 2 commits intomicrosoft:masterfrom
JackBoosY wants to merge 2 commits intomicrosoft:masterfrom
Conversation
PhoebeHui
approved these changes
Jan 6, 2020
PhoebeHui
added
the
info:needs-maintainer-attention
Contributor
|
isn't it better to remove stb header from nanovg and add a dependency on it? |
dan-shaw
removed
the
info:needs-maintainer-attention
Contributor
|
it has been fixed in master thanks to #8813 merge, I think this PR is no longer necessary |
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
4 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.
port stb and nanovg have file conflicts:
So far the pipeline has only reported
x86-windowsconflicts and less than 10 ports depend on stb, so onlystb:x86-windows=ignoreis added.Related: #9552 #9550.