CANNOT_MERGE_SAME duplicate entry#11
Open
ashishpatel1992 wants to merge 1 commit intophpbbmodders:masterfrom
Open
CANNOT_MERGE_SAME duplicate entry#11ashishpatel1992 wants to merge 1 commit intophpbbmodders:masterfrom
ashishpatel1992 wants to merge 1 commit intophpbbmodders:masterfrom
Conversation
CANNOT_MERGE_SAME duplicate entry removed
Contributor
|
The purpose of that lang entry is in case an admin tries to merge the same user (same user id). Nothing to do with trying to merge himself. It is not a duplicate entry in the lang file. |
Author
|
For both of them keys are same, they should have different keys for different text. |
Contributor
|
Please look again. They are not the same keys. |
Author
Contributor
|
I missed that one and you are quite right. I don't have access to the repo on here anymore to make the merge of your commit. |
Author
|
@rmcgirr83 I think someone from phpbbmodders would accept this merge |
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.

CANNOT_MERGE_SAME duplicate entry removed