translated into Chinese: ES6 modules today with 6to5

[hacke2]

No description provided.

[UltCombo]

Hey @hacke2, isn't this the same PR as #15? I've already merged it in 3434b7a

[UltCombo]

#16 (comment) :

I've already accepted your other PR (#15) and merged it into 3434b7a, so you didn't have to open a new one. :)

---

Thank you very much for all the effort!
Your translation will be live in the site as soon as we get a Chinese flag in svg format (#18).

[UltCombo]

Oh I see this time you've included the description metadata, thanks! Merged it in eb049aa

Make sure to git pull from https://github.com/es6rocks/es6rocks.github.io.git's src branch for your repository to stay up-to-date.
It'd be nice if you created a new branch for each pull request, so that you won't run into conflicts when pulling from the upstream's src branch.
See Feature Branch Workflow (just note that we use the src branch instead of master here).

[UltCombo]

In case you're having trouble to fix your src branch (as it now conflicts with the upstream's src due to my merges), I believe you can fix it with:

git remote add upstream https://github.com/es6rocks/es6rocks.github.io.git
git fetch --all
git checkout src
git reset --hard upstream/src
git push -f origin src

I haven't tested the code above, but I believe it should work.
Then when you start a new translation:

git checkout -b "cn-translation" src
# you may change "cn-translation" to any other name to use as branch name

Then just edit the files, commit and push as you're used to. By default, Git will push to a new branch in the origin with the same name as your current branch. You can then open a pull request as usual.

After your PR is merged, you can update your src branch:

git checkout src
git pull upstream src
git push origin src

And that's it. When you start working in the next translation, just repeat the steps above starting at the branch creation. It is also good to do a git pull upstream src to make sure your branch is up-to-date before you create a branch to start working.

[UltCombo]

Perhaps a simpler approach which doesn't involve your local src branch:

Setup remotes:

git remote add upstream https://github.com/es6rocks/es6rocks.github.io.git

Fetch remote changes and create a branch using upstream/src as the base:

git fetch upstream
git checkout -b "cn-translation" upstream/src

Edit, commit and push your new branch to your forked repo, then open a PR. This way you would never have to touch your local src branch. I haven't tested it yet, but I believe this should work nicely.

@jaydson perhaps we should add a branching step to the contributing guide? It is a simple part of the Feature Branch Workflow, but I guess it could help out Git starters.

[jaydson]

Yep, sounds good @UltCombo

[hacke2]

I for GIT use is not very skilled, I use

git checkout -b src src

before.can this way.can this way.?
besides,why show me isn's merge but closed?
I'm going to call on more people to participate in translation activity.
when can I see cn page?beacuse the cn version ES6Rock can attract more people.
can I join es6rock organization in github?:D

[UltCombo]

before.can this way.can this way.?

Sorry, I didn't understand. But in any case, if you run into issues which you can't fix, you can always clone the repository again.

besides,why show me isn's merge but closed?

That is because I didn't use GitHub's built-in merge, instead I've pulled your commit and fixed a couple things, then pushed it. You can see I've kept your credentials as the author of this commit, and it shows my name below as the committer. As you can see, your commit was merged manually, but GitHub does not recognize this and still leaves the pull request open. I closed the pull request then as it was already merged.
Whenever you see a comment like "Landed in <commit link>" you will know that your pull request was merged manually. 😃

I'm going to call on more people to participate in translation activity.

Yay. :D

when can I see cn page?

As soon as we solve #18, I believe.

can I join es6rock organization in github?

I guess you have to talk with @jaydson and @atilafassina. =]

[hacke2]

I see. This a few days to harvest a lot,Thanks!