Translate 05-distributed-git distributed-workflows #117
Conversation
This file contains hidden or 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
| 同传统的集中式版本控制系统（CVCS）不同，Git 的分布式特性使得开发者间的协作变得更加灵活多样。 | ||
| 在集中式系统中，每个开发者就像是连接在集线器上的节点，彼此的工作方式大体相像。 | ||
| 而在 Git 中，每个开发者同时扮演着节点和集线器的角色——也就是说，每个开发者既可以将自己的代码贡献到其他的仓库中，也能同时维护自己的公有仓库，让其他人可以在其基础上工作并贡献代码。 | ||
| 由此，Git 的分布式协作可以为你的项目和团队衍生出种种不同的工作流程，接下来的章节会介绍几种常见的应用方式，它们都利用了 Git 这种灵活的特性。 |
|
@secondwtq 非常感谢review，已修改。 少部分有出入的地方见note。 |
|
注意一个问题，提交的 Pull Request 右上角显示的增加删除行数应是一致的。 |
|
@networm 已修正 |
| We'll go over the strengths and possible weaknesses of each design; you can choose a single one to use, or you can mix and match features from each. | ||
| 同传统的集中式版本控制系统（CVCS）不同，Git 的分布式特性使得开发者间的协作变得更加灵活多样。 | ||
| 在集中式系统中，每个开发者就像是连接在集线器上的节点，彼此的工作方式大体相像。 | ||
| 而在 Git 中，每个开发者同时扮演着节点和集线器的角色——也就是说，每个开发者既可以将自己的代码贡献到其他的仓库中，也能同时维护自己的公有仓库，让其他人可以在其基础上工作并贡献代码。 |
There was a problem hiding this comment.
两个破折号是一样的：
破折号“——”
集线器的角色——也就是说
|
@leshiv 已完成 |
| 5. The maintainer adds the contributor's repo as a remote and merges locally. | ||
| 6. The maintainer pushes merged changes to the main repository. | ||
| 因为 Git 允许存在多个远程仓库，便使得每个开发者拥有自己仓库的写权限，以及其他所有人仓库的读权限的工作流成为可能。 | ||
| 这种情形下通常会有个代表``官方''项目的权威的仓库（blessed repository）。 |
There was a problem hiding this comment.
blessed repository 在英文原文中并未体现？
canonical repository?
There was a problem hiding this comment.
blessed repository 是参考v1版对配图里文字的注释，先统一去掉了
|
建议将public repository译为 公开仓库 而不是 公共仓库 |
| 2. Lieutenants merge the developers' topic branches into their `master` branch. | ||
| 3. The dictator merges the lieutenants' `master` branches into the dictator's `master` branch. | ||
| 4. The dictator pushes their `master` to the reference repository so the other developers can rebase on it. | ||
| 这其实是上一种工作流程的变种。 |
There was a problem hiding this comment.
multiple-repository workflow -> 多仓库工作流？
|
@leshiv 已审校 |
|
@leshiv 请及时修正。 |
|
@IceNature @summershrimp 非常感谢review！大部分已参考建议修改，个别有异议地方见line note。 |
|
@networm 已根据三位reviewer的建议修正 |
networm
added a commit
that referenced
this pull request
Aug 10, 2015
Translate 05-distributed-git distributed-workflows
|
@leshiv 已合并入主干。 |
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.
v1版本的译者加了一些便于读者理解的个人注释，这里暂时没有保留。
请review，会及时修改，感谢！