Fixes bug #74906 - redirecting incorrect include <sys/errno.h>#2626
Closed
petk wants to merge 1 commit intophp:PHP-7.0from
Closed
Fixes bug #74906 - redirecting incorrect include <sys/errno.h>#2626petk wants to merge 1 commit intophp:PHP-7.0from
petk wants to merge 1 commit intophp:PHP-7.0from
Conversation
Member
|
This merges cleanly in 7.0 and 7.1, but master there is a conflict, please would you have a look at that as I'm not confident about resolving it myself ? |
Member
Author
|
Yes, probably because there is a commit made in master branch on that file after the PHP-7.0 and PHP-7.1 branches. Should I open a separate pull request for the master branch? |
Member
Author
|
Master branch had multiple changes in that file since, so I've made above separate pull request for master branch only instead... |
Member
|
Merged 4d08b9d Thanks. |
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
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.
Hello, when compiling PHP on Alpine Linux, there appears a warning:
This patch fixes bug 74906 where more info is provided.