Translate 05-distributed-git contributing v2 #162
Merged
Conversation
This file contains 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
networm
changed the title
|
|
||
| All these questions can affect how you contribute effectively to a project and what workflows are preferred or available to you. | ||
| We'll cover aspects of each of these in a series of use cases, moving from simple to more complex; you should be able to construct the specific workflows you need in practice from these examples. | ||
| 描述如何向一个项目贡献的主要困难在于有非常多的变种形式来完成贡献。 |
There was a problem hiding this comment.
“有非常多的变种形式来完成贡献”不甚通顺，换成“完成贡献有很多不同的方式”如何？
| When you want to share that work, you merge it into your own master branch, then fetch and merge `origin/master` if it has changed, and finally push to the `master` branch on the server. | ||
| The general sequence is something like this: | ||
| 这是一个最简单的工作流程。 | ||
| 你工作一会儿，通常在一个特性分支，当它准备好整合时合并回你的 master 分支。 |
There was a problem hiding this comment.
你工作一会儿，通常在一个特性分支=》你通常在一个特性分支工作一会儿
|
@networm 已完成 |
|
@IceNature 已修正。 |
| 在许多情况下，你可能会有两三个开发者一天提交几次，对于不活跃的项目可能更少。 | ||
| 对于大一些的公司或项目，开发者的数量可能会是上千，每天都有成百上千次提交。 | ||
| 这很重要，因为随着开发者越来越多，在确保你的代码能干净地应用或轻松地合并时会遇到更多问题。 | ||
| 提交的改动可能表现为过时的，也可能在你工作或者改动等待批准或应用时代码被合并入的工作严重损坏。 |
There was a problem hiding this comment.
"that is merged in while you were working" 这里的working是不是可以理解为“正在做改动”
“也可能在你 正在做改动 或等待改动被 批准应用 时被合并入的工作严重破坏” （把“批准应用”合起来而不是“批准或应用”感觉不会太影响意思，否则出现两个“或”会与前面的“或”有冲突）
|
@networm 辛苦，已审校 |
|
@morefreeze 已修正，异议部分已提出意见。 |
networm
added a commit
that referenced
this pull request
Aug 10, 2015
Translate 05-distributed-git contributing
OlingCat
pushed a commit
to OlingCat/progit2-zh
that referenced
this pull request
Mar 6, 2020
Revert "Fix missed include"
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.
No description provided.