Merged
Conversation
Move shipped public APIs to PublicAPI.Shipped.txt
Contributor
|
Tagging @mavasani to help with the build failures. It looks like we need much more than a "choose dev15.6.x" only to fix the merge conflict. Can you help with fixing this fully please? |
Contributor
|
@AbhitejJohn I would recommend starting with "choose dev15.5.x" to fix the merge conflicts. Unshipped.txt files should only contain public APIs that were added as post dev15.5.x |
Choosing dev15.5.x as the base instead.
Choosing dev15.5.x as the base instead.
Contributor
|
@mavasani : I think I got it. Can you review please? |
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.
This is an automatically generated pull request from dev15.5.x into dev15.6.x.
git fetch --all git checkout merges/dev15.5.x-to-dev15.6.x-20180206-080005 git reset --hard upstream/dev15.6.x git merge upstream/dev15.5.x # Fix merge conflicts git commit git push merges/dev15.5.x-to-dev15.6.x-20180206-080005 --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.