Fix duplicate entries after failed patch. #143
Merged
Conversation
This file contains 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
|
@cweagans ^^ (this patch is really important!) |
|
Thanks for fixing this! Sorry for the delay. Was AFK. |
|
I still have the same issue with the patch applied here and described in #142. I replaced all array_marge_recursive() calls with $this->arrayMergeRecursiveDistinct() and all patches apply cleanly every time. It seems like having a distinct structure is the better intention of the code anyways, so we should reuse it #149 |
|
The PR 149 fixes the issue. Thanks |
|
I updated the pull request to the latest master |
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.
This supersedes #142, though installed.json needs to be manually cleaned to get back to a good state.
Closes: #123