Open
Conversation
Contributor
Author
|
@fire-light42 any chance we can try to move forward with this a little quicker this time so it doesn't keep conflicting? No worries though, I can keep fixing them if so for a little bit this time anyway, would just help a bit if we could. Thanks! |
Collaborator
|
Yes I will try to get it merged a bit quicker, there have simply been too many pull requests to handle everything in a timely manner. However, as a general policy I have always been trying to fix conflicts myself. Contributors need not be worried about conflicts, as I will fix any before merging outdated pull requests. |
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
2 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.
Trying #2356 again. (I apologize I closed that, was just a little annoyed this kept conflicting, hopefully we can get it merged a little quicker this time?)
This requires #2667, #2668, and #2669 to be merged first.