Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated Traditional Chinese (Taiwan) Translations #696

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Updated Traditional Chinese (Taiwan) Translations #696

wants to merge 4 commits into from

Conversation

alexclassroom
Copy link
Contributor

No description provided.

@GaryJones
Copy link
Member

Thanks for the update.

There's a merge conflict which needs to be addressed.

@alexclassroom
Copy link
Contributor Author

commit ba8bc06 is correct.

@GaryJones
Copy link
Member

GaryJones commented Sep 19, 2017

Check out develop, and ensure it is up to date with upstream/develop (the TGMPA repo should be upstream). Push to your origin.
Then check out on your PR branch, and the rebase it onto develop. Fix the merge conflicts, finish the rebase, and then force push to your origin.

@jrfnl
Copy link
Contributor

jrfnl commented Mar 12, 2018

@alexclassroom Just checking in as we'd be happy to merge this, but can't as long as the branch is in conflict.
Could you please rebase the branch on the current develop branch as described by @GaryJones in the previous comment ?

@alexclassroom
Copy link
Contributor Author

alexclassroom commented Mar 12, 2018 via email

@jrfnl
Copy link
Contributor

jrfnl commented Mar 12, 2018

@alexclassroom Appreciated!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants