Translate 07-git-tools rerere v2 #170
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
| @@ -1,24 +1,24 @@ | |||
| [[_rerere]] | |||
| === Rerere | |||
|
|
|||
| The `git rerere` functionality is a bit of a hidden feature. The name stands for ``reuse recorded resolution'' and as the name implies, it allows you to ask Git to remember how you've resolved a hunk conflict so that the next time it sees the same conflict, Git can automatically resolve it for you. | |||
| `git rerere` 功能是一个隐藏的功能。名字代表 ``reuse recorded resolution'' 并且正如名字所暗示的，它允许你让 Git 记住你如何解决一个块冲突的，这样在下一次看到相同的冲突，Git 可以为你自动地解决它。 | |||
There was a problem hiding this comment.
名字代表 reuse recorded resolution'' 并且正如名字所暗示的，它允许你让 Git 记住你如何解决一个块冲突的，这样在下一次看到相同的冲突，Git 可以为你自动地解决它=》正如它的名字reuse recorded resolution'' 所指，它允许你让 Git 记住解决一个块冲突的方法，这样在下一次看到相同冲突时，Git 可以为你自动地解决它
|
@networm 已完成 |
|
@IceNature 已修正。 |
| @@ -131,11 +131,11 @@ Recorded resolution for 'hello.rb'. | |||
| [master 68e16e5] Merge branch 'i18n' | |||
| ---- | |||
|
|
|||
| You can see that it "Recorded resolution for FILE". | |||
| 可以看到它 "Recorded resolution for FILE"。 | |||
There was a problem hiding this comment.
这里的双引号内的东西是否需要翻译出来？
可以看到它"记录了 FILE 的解决方案"
之类？
There was a problem hiding this comment.
不翻译，要翻译的话也是用 Git 中文包中对应的翻译，但是大部分人都是用的英文版 Git，所以建议保留。
|
@networm 已审核完毕，并提出 2 个修改意见。 |
|
@Geno1024 已修正，异议已评论。 |
|
@networm 已回复评论，无异议。 |
| @@ -236,4 +236,4 @@ $ git rebase --continue | |||
| Applying: i18n one word | |||
| ---- | |||
|
|
|||
| So, if you do a lot of re-merges, or want to keep a topic branch up to date with your master branch without a ton of merges, or you rebase often, you can turn on `rerere` to help your life out a bit. | |||
| 所以，如果做了很多次重新合并，或者想要一个特性分支始终与你的 master 分支保持最新但却不想要一大堆合并，或者经常变基，打开 `rerere` 可以帮助你的生活变得更美好。 | |||
There was a problem hiding this comment.
所以，如果做了很多次重新合并，或者想要一个特性分支始终与你的 master 分支保持最新但却不想要一大堆合并，或者经常变基，你可以将 打开rerere的帮助文档,处理冲突将变得很简单。
|
@jeffsui 已修正。 |
OlingCat
pushed a commit
to OlingCat/progit2-zh
that referenced
this pull request
Mar 6, 2020
Fix 'dummy ours merge strategy' display
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.