Teamspeak #4709
Closed
Teamspeak #4709
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
Co-authored-by: Matthew Penner <[email protected]>
|
Wy is this not just 1 commit? |
|
Your PR is based on develop branch, instead of target 1.0 develop |
|
Ow, that is wy. sorry |
|
? |
|
is everything ok with the pr? can it be taken over like this? |
|
No, as you can see there are over 1k changes because your base branch is wrong |
|
What branch should i use? |
|
Your PR should be based on the same 1.0 develop branch that you are trying to merge to. Right now, you are trying to merge all V2 changes into v1 branch. Develop branch is for the future V2 panel release and is completely different from the current v1. |
|
Ach scheiß drauf |
|
Closed in favour of #5099 |
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.
you can now start yout teamspeak server with a serverquery password defined under startup