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

[WIP] Translation for Bahasa Indonesia #100

Merged
merged 21 commits into from
Jan 14, 2017
Merged

[WIP] Translation for Bahasa Indonesia #100

merged 21 commits into from
Jan 14, 2017

Conversation

rvlewerissa
Copy link
Contributor

This will be the translation for Bahasa Indonesia. Still working on it :)
Will appreciate any form of help! 👍

Cheers!

@jwasham
Copy link
Owner

jwasham commented Jan 3, 2017

Let me know when you want me to pull.

@jwasham jwasham mentioned this pull request Jan 3, 2017
@santosomichael
Copy link
Contributor

@jwasham Sorry if I look like spamming, I'm confused where to start to fork. Do I have to wait for your merge into translation folder on the master?

@rvlewerissa
Copy link
Contributor Author

rvlewerissa commented Jan 4, 2017

@santosomichael try to use the same method I've described in the issue again, it should automatically push to this PR.

@rvlewerissa
Copy link
Contributor Author

@fahminlb33 try not to merge branch ya, just rebase the branch it so it will look linear 👍

@fahminlb33
Copy link
Contributor

Sorry, I'm using VSCode to push, I think VSCode automatically merge it. I'll use git bash from now (y)

@rvlewerissa
Copy link
Contributor Author

rvlewerissa commented Jan 4, 2017

@santosomichael yes, because your branch's commit is behind the remote branch (because other people commit to this branch too), to avoid the normal merging (which logs a new commit saying that the branch is merged), you can just rebase it. So whenever you try to push to the remote repo, do this first:
git origin indonesiaTranslation --rebase

Then you can safely push it. You might want to check this:
https://www.atlassian.com/git/tutorials/merging-vs-rebasing/conceptual-overview

@santosomichael
Copy link
Contributor

@rvlewerissa Thank's a lot for this great information

@rvlewerissa
Copy link
Contributor Author

@jwasham Hi, this PR has gone quite long and up for quite some time.

What do you think on merging it first?

Thanks, man.

@jwasham
Copy link
Owner

jwasham commented Jan 14, 2017

Will do.

@jwasham jwasham merged commit 502fc24 into jwasham:master Jan 14, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants