Merged
Conversation
原文是:If you do some work on your local master branch, and, in the meantime, someone else pushes to git.ourcompany.com and updates its master branch, then your histories move forward differently. Also, as long as you stay out of contact with your origin server, your origin/master pointer doesn’t move. 在原译文中,有如下两个位置认为翻译的不够准确,不容易让人理解。 1. and, in the meantime, 原翻译为:然而在同一时间。这其中没有转折关系,而and作为连接词在此处完全可以不用翻译出来的。 2. Also, as long as,原翻译为:也许,只要……。根据前后文,这个也许实在是让人费解,并不是说明后者是前者的另一种可能性,所以认为此处应该换个词语来进行表达,翻译为:另外。 修改后的翻译为(*xx*标记出修改位置):如果你在本地的 `master` 分支做了一些工作,*与此同时*,其他人推送提交到 `git.ourcompany.com` 并更新了它的 `master` 分支,那么你的提交历史将向不同的方向前进。 *另外*,只要你不与 origin 服务器连接,你的 `origin/master` 指针就不会移动。
Member
|
这几句都是我翻译的,惭愧。 |
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
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.
原文是:If you do some work on your local master branch, and, in the meantime, someone else pushes to git.ourcompany.com and updates its master branch, then your histories move forward differently. Also, as long as you stay out of contact with your origin server, your origin/master pointer doesn’t move.
在原译文中,有如下两个位置认为翻译的不够准确,不容易让人理解。
修改后的翻译为(xx标记出修改位置):如果你在本地的
master分支做了一些工作,与此同时,其他人推送提交到git.ourcompany.com并更新了它的master分支,那么你的提交历史将向不同的方向前进。另外,只要你不与 origin 服务器连接,你的
origin/master指针就不会移动。