This repository was archived by the owner on Aug 15, 2024. It is now read-only.
Closed
Conversation
Contributor
Author
|
Just making sure, if I can just resolve them manually, would that also be fine? @cmb69 |
Member
|
Thanks @lavturo! The patch looks good. (A minor improvement might be to move the task scheduler registration file to some other folder, to make its purpose clearer.) Regarding the merge conflict resolution: it doesn't matter how you resolve these; a rebase should usually work fine, but there are alternatives. The final result should be the same, regardless of how the conflicts have been resolved. |
|
Comment on behalf of cmb at php.net: Applied as 848cc83. 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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
@cmb69 I believe I got the batch file to automatically test snapshot builds daily (if they are available). Could you check it? It's mostly in the auto_test_snap.cmd.
There were other small modifications in other files but I think something got messed up with the commits, which is why it's saying it can't automatically merge now. Do I need to rebase?