search

nodejs / nodejs-zh-CN

node.js 中文化 & 中文社区
https://nodejs.org/zh-cn/
Other
394 stars 62 forks source link

翻译 GOVERNANCE.md #114

Closed mattma closed 9 years ago

mattma commented 9 years ago

请大家看看，多多指教。

fengmk2 commented 9 years ago

+1

再来一个人 review 就可以合并了。/cc @turingou @popomore

mattma commented 9 years ago

不行了，熬不住了，先睡了。Feel free to change it if you like with my full support

fengmk2 commented 9 years ago

review 没问题的话， @mattma 就 squash 一下 commits 成一个

mattma commented 9 years ago

我把所有的问题都解决了，应该没有任何要改的了。好的。我 Squash 之后再给一个 Commit

fengmk2 commented 9 years ago

@dead-horse @turingou xuy你们的+1

mattma commented 9 years ago

@fengmk2 Good morning. 起的够早的。关于 Squash ，我有个问题。 我一直在 Pull branch gh-pages into my feature branch. so the branch tree look like this,

* 49f5fe8 Matt Ma: patch some keyword translation -   (HEAD, origin/feature/issue90, feature/issue90) (3 days ago)
* 617472d Matt Ma: update the translation with latest comment -   (4 days ago)
* 1f34a31 Matt Ma: fine tune some translation -   (4 days ago)
* b2b71e0 Matt Ma: update the PR keyword replace incorrect translation -   (4 days ago)
*   51e9b18 Matt Ma: Merge branch 'gh-pages' into feature/issue90 -   (4 days ago)
|\
| *   383ad8e fengmk2: Merge pull request #110 from iojs/favicon -   (6 days ago)
| |\
| | * 3d5824b luin: Add favicon -   (6 days ago)
| |/
* | eb5ee24 Matt Ma: proof read the translation -   (4 days ago)
* | 3593f5b Matt Ma: initial draft for completely translate the project governace model -   (5 days ago)
* | a62decc Matt Ma: translate half of the article, still in process -   (5 days ago)
|/
*   a350913 fengmk2: Merge pull request #108 from iojs/fix-tweet-link -   (6 days ago)
|\
| * 368aa8c fengmk2: fix tweet link missing some content -   (6 days ago)
|/

所有的 Commits 全都在 Origin 上了，Squash 会不会有危险？而且所有的 Commits 都 Mix 在一起，如何更有效的 Squash ？

fengmk2 commented 9 years ago

我会通过rebase来做

Sent from my iPhone

On Mar 3, 2015, at 8:36 AM, Matt Ma notifications@github.com wrote:

@fengmk2 Good morning. 起的够早的。关于 Squash ，我有个问题。 我一直在 Pull branch gh-pages into my feature branch. so the branch tree look like this,

  • 49f5fe8 Matt Ma: patch some keyword translation - (HEAD, origin/feature/issue90, feature/issue90) (3 days ago)
  • 617472d Matt Ma: update the translation with latest comment - (4 days ago)
  • 1f34a31 Matt Ma: fine tune some translation - (4 days ago)
  • b2b71e0 Matt Ma: update the PR keyword replace incorrect translation - (4 days ago)
  • 51e9b18 Matt Ma: Merge branch 'gh-pages' into feature/issue90 - (4 days ago) |\ | * 383ad8e fengmk2: Merge pull request #110 from iojs/favicon - (6 days ago) | |\ | | * 3d5824b luin: Add favicon - (6 days ago) | |/
  • | eb5ee24 Matt Ma: proof read the translation - (4 days ago)
  • | 3593f5b Matt Ma: initial draft for completely translate the project governace model - (5 days ago)
  • | a62decc Matt Ma: translate half of the article, still in process - (5 days ago) |/
  • a350913 fengmk2: Merge pull request #108 from iojs/fix-tweet-link - (6 days ago) |\ | * 368aa8c fengmk2: fix tweet link missing some content - (6 days ago) |/ 所有的 Commits 全都在 Origin 上了，Squash 会不会有危险？而且所有的 Commits 都 Mix 在一起，如何更有效的 Squash ？

— Reply to this email directly or view it on GitHub.

guo-yu commented 9 years ago

+1

mattma commented 9 years ago

I have squashed all the commits into one, should I create a new PR or rewrite the history of this PR? Well, @fengmk2 feel free to just take over and merge into the gh-pages

mattma commented 9 years ago

@fengmk2 We got two +1 and is ready to merge.

fengmk2 commented 9 years ago

force提交上来覆盖就好了。可以合并了

mattma commented 9 years ago

@fengmk2 pull the trigger...

fengmk2 commented 9 years ago

感谢各位