{"action":"created","comment":{"url":"https://api.github.com/repos/progit/progit2-zh/pulls/comments/36589760","id":36589760,"diff_hunk":"@@ -1,19 +1,19 @@\n [[_advanced_merging]]\n-=== Advanced Merging\n+=== 高级合并\n \n-Merging in Git is typically fairly easy. Since Git makes it easy to merge another branch multiple times, it means that you can have a very long lived branch but you can keep it up to date as you go, solving small conflicts often, rather than be surprised by one enormous conflict at the end of the series.\n+在 Git 中合并是相当容易的。因为 Git 使多次合并另一个分支变得很容易，这意味着你可以有一个始终保持最新的长期分支，经常解决小的冲突，比在一系列提交后解决一个巨大的冲突要好。\n \n-However, sometimes tricky conflicts do occur. Unlike some other version control systems, Git does not try to be overly clever about merge conflict resolution. Git's philosophy is to be smart about determining when a merge resolution is unambiguous, but if there is a conflict, it does not try to be clever about automatically resolving it. Therefore, if you wait too long to merge two branches that diverge quickly, you can run into some issues.\n+然而，有时也会有棘手的冲突。不像其他的版本控制系统，Git 并不会尝试过于聪明的合并冲突解决方案。Git 的哲学是聪明地决定无歧义的合并方案，但是如果有冲突，它不会尝试智能地自动解决它。因此，如果很久之后才合并两个分叉的分支，你可能会撞上一些问题。\n \n-In this section, we'll go over what some of those issues might be and what tools Git gives you to help handle these more tricky situations. We'll also cover some of the different, non-standard types of merges you can do, as well as see how to back out of merges that you've done.\n+在本节中，我们将会仔细查看那些问题是什么以及 Git 给了我们什么工具来帮助我们处理这些更难办的情形。我们也会了解你可以做的不同的、非标准类型的合并，也会看到如何后退到合并之前。\n \n-==== Merge Conflicts\n+==== 合并冲突\n \n-While we covered some basics on resolving merge conflicts in <<_basic_merge_conflicts>>, for more complex conflicts, Git provides a few tools to help you figure out what's going on and how to better deal with the conflict.\n+我们在 <<_basic_merge_conflicts>> 介绍了解决合并冲突的一些基础知识，对于更复杂的冲突，Git 提供了几个工具来帮助你指出将会发生什么以及如何更好地处理冲突。\n \n-First of all, if at all possible, try to make sure your working directory is clean before doing a merge that may have conflicts. If you have work in progress, either commit it to a temporary branch or stash it. This makes it so that you can undo *anything* you try here. If you have unsaved changes in your working directory when you try a merge, some of these tips may help you lose that work.\n+首先，在做一次可能有冲突的合并前尽可能保证工作目录是干净的。如果你有正在做的工作，要么提交到一个临时分支要么储藏它。这使你可以撤消在这里尝试做的 *任何事情*。如果在你尝试一次合并时工作目录中有未保存的改动，下面的这些技巧可能会使你丢失那些工作。","path":"book/07-git-tools/sections/advanced-merging.asc","position":21,"original_position":21,"commit_id":"f9ab00b74ef7f7623c33d33ddd6ea6a362cfcf11","original_commit_id":"f9ab00b74ef7f7623c33d33ddd6ea6a362cfcf11","user":{"login":"Geno1024","id":6427392,"avatar_url":"https://avatars.githubusercontent.com/u/6427392?v=3","gravatar_id":"","url":"https://api.github.com/users/Geno1024","html_url":"https://github.com/Geno1024","followers_url":"https://api.github.com/users/Geno1024/followers","following_url":"https://api.github.com/users/Geno1024/following{/other_user}","gists_url":"https://api.github.com/users/Geno1024/gists{/gist_id}","starred_url":"https://api.github.com/users/Geno1024/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Geno1024/subscriptions","organizations_url":"https://api.github.com/users/Geno1024/orgs","repos_url":"https://api.github.com/users/Geno1024/repos","events_url":"https://api.github.com/users/Geno1024/events{/privacy}","received_events_url":"https://api.github.com/users/Geno1024/received_events","type":"User","site_admin":false},"body":"目测”任何事情“的星号前面的空格不需要。","created_at":"2015-08-09T15:55:53Z","updated_at":"2015-08-09T15:55:53Z","html_url":"https://github.com/progit/progit2-zh/pull/169#discussion_r36589760","pull_request_url":"https://api.github.com/repos/progit/progit2-zh/pulls/169","_links":{"self":{"href":"https://api.github.com/repos/progit/progit2-zh/pulls/comments/36589760"},"html":{"href":"https://github.com/progit/progit2-zh/pull/169#discussion_r36589760"},"pull_request":{"href":"https://api.github.com/repos/progit/progit2-zh/pulls/169"}}},"pull_request":{"url":"https://api.github.com/repos/progit/progit2-zh/pulls/169","id":39151203,"html_url":"https://github.com/progit/progit2-zh/pull/169","diff_url":"https://github.com/progit/progit2-zh/pull/169.diff","patch_url":"https://github.com/progit/progit2-zh/pull/169.patch","issue_url":"https://api.github.com/repos/progit/progit2-zh/issues/169","number":169,"state":"open","locked":false,"title":"Translate 07-git-tools advanced-merging v2","user":{"login":"networm","id":440624,"avatar_url":"https://avatars.githubusercontent.com/u/440624?v=3","gravatar_id":"","url":"https://api.github.com/users/networm","html_url":"https://github.com/networm","followers_url":"https://api.github.com/users/networm/followers","following_url":"https://api.github.com/users/networm/following{/other_user}","gists_url":"https://api.github.com/users/networm/gists{/gist_id}","starred_url":"https://api.github.com/users/networm/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/networm/subscriptions","organizations_url":"https://api.github.com/users/networm/orgs","repos_url":"https://api.github.com/users/networm/repos","events_url":"https://api.github.com/users/networm/events{/privacy}","received_events_url":"https://api.github.com/users/networm/received_events","type":"User","site_admin":false},"body":"","created_at":"2015-07-03T07:16:50Z","updated_at":"2015-08-09T15:55:53Z","closed_at":null,"merged_at":null,"merge_commit_sha":"cd22315a3acdf42fe90a7f8258123a79f6bb8d1d","assignee":null,"milestone":{"url":"https://api.github.com/repos/progit/progit2-zh/milestones/1","html_url":"https://github.com/progit/progit2-zh/milestones/v1.0.0","labels_url":"https://api.github.com/repos/progit/progit2-zh/milestones/1/labels","id":1231002,"number":1,"title":"v1.0.0","description":"所有内容翻译完成并经过审校后合并入主干分支。","creator":{"login":"networm","id":440624,"avatar_url":"https://avatars.githubusercontent.com/u/440624?v=3","gravatar_id":"","url":"https://api.github.com/users/networm","html_url":"https://github.com/networm","followers_url":"https://api.github.com/users/networm/followers","following_url":"https://api.github.com/users/networm/following{/other_user}","gists_url":"https://api.github.com/users/networm/gists{/gist_id}","starred_url":"https://api.github.com/users/networm/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/networm/subscriptions","organizations_url":"https://api.github.com/users/networm/orgs","repos_url":"https://api.github.com/users/networm/repos","events_url":"https://api.github.com/users/networm/events{/privacy}","received_events_url":"https://api.github.com/users/networm/received_events","type":"User","site_admin":false},"open_issues":35,"closed_issues":20,"state":"open","created_at":"2015-07-29T06:50:16Z","updated_at":"2015-08-08T05:15:18Z","due_on":null,"closed_at":null},"commits_url":"https://api.github.com/repos/progit/progit2-zh/pulls/169/commits","review_comments_url":"https://api.github.com/repos/progit/progit2-zh/pulls/169/comments","review_comment_url":"https://api.github.com/repos/progit/progit2-zh/pulls/comments{/number}","comments_url":"https://api.github.com/repos/progit/progit2-zh/issues/169/comments","statuses_url":"https://api.github.com/repos/progit/progit2-zh/statuses/f9ab00b74ef7f7623c33d33ddd6ea6a362cfcf11","head":{"label":"networm:07-git-tools_advanced-merging","ref":"07-git-tools_advanced-merging","sha":"f9ab00b74ef7f7623c33d33ddd6ea6a362cfcf11","user":{"login":"networm","id":440624,"avatar_url":"https://avatars.githubusercontent.com/u/440624?v=3","gravatar_id":"","url":"https://api.github.com/users/networm","html_url":"https://github.com/networm","followers_url":"https://api.github.com/users/networm/followers","following_url":"https://api.github.com/users/networm/following{/other_user}","gists_url":"https://api.github.com/users/networm/gists{/gist_id}","starred_url":"https://api.github.com/users/networm/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/networm/subscriptions","organizations_url":"https://api.github.com/users/networm/orgs","repos_url":"https://api.github.com/users/networm/repos","events_url":"https://api.github.com/users/networm/events{/privacy}","received_events_url":"https://api.github.com/users/networm/received_events","type":"User","site_admin":false},"repo":{"id":28445173,"name":"progit2-zh","full_name":"networm/progit2-zh","owner":{"login":"networm","id":440624,"avatar_url":"https://avatars.githubusercontent.com/u/440624?v=3","gravatar_id":"","url":"https://api.github.com/users/networm","html_url":"https://github.com/networm","followers_url":"https://api.github.com/users/networm/followers","following_url":"https://api.github.com/users/networm/following{/other_user}","gists_url":"https://api.github.com/users/networm/gists{/gist_id}","starred_url":"https://api.github.com/users/networm/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/networm/subscriptions","organizations_url":"https://api.github.com/users/networm/orgs","repos_url":"https://api.github.com/users/networm/repos","events_url":"https://api.github.com/users/networm/events{/privacy}","received_events_url":"https://api.github.com/users/networm/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/networm/progit2-zh","description":"","fork":true,"url":"https://api.github.com/repos/networm/progit2-zh","forks_url":"https://api.github.com/repos/networm/progit2-zh/forks","keys_url":"https://api.github.com/repos/networm/progit2-zh/keys{/key_id}","collaborators_url":"https://api.github.com/repos/networm/progit2-zh/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/networm/progit2-zh/teams","hooks_url":"https://api.github.com/repos/networm/progit2-zh/hooks","issue_events_url":"https://api.github.com/repos/networm/progit2-zh/issues/events{/number}","events_url":"https://api.github.com/repos/networm/progit2-zh/events","assignees_url":"https://api.github.com/repos/networm/progit2-zh/assignees{/user}","branches_url":"https://api.github.com/repos/networm/progit2-zh/branches{/branch}","tags_url":"https://api.github.com/repos/networm/progit2-zh/tags","blobs_url":"https://api.github.com/repos/networm/progit2-zh/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/networm/progit2-zh/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/networm/progit2-zh/git/refs{/sha}","trees_url":"https://api.github.com/repos/networm/progit2-zh/git/trees{/sha}","statuses_url":"https://api.github.com/repos/networm/progit2-zh/statuses/{sha}","languages_url":"https://api.github.com/repos/networm/progit2-zh/languages","stargazers_url":"https://api.github.com/repos/networm/progit2-zh/stargazers","contributors_url":"https://api.github.com/repos/networm/progit2-zh/contributors","subscribers_url":"https://api.github.com/repos/networm/progit2-zh/subscribers","subscription_url":"https://api.github.com/repos/networm/progit2-zh/subscription","commits_url":"https://api.github.com/repos/networm/progit2-zh/commits{/sha}","git_commits_url":"https://api.github.com/repos/networm/progit2-zh/git/commits{/sha}","comments_url":"https://api.github.com/repos/networm/progit2-zh/comments{/number}","issue_comment_url":"https://api.github.com/repos/networm/progit2-zh/issues/comments{/number}","contents_url":"https://api.github.com/repos/networm/progit2-zh/contents/{+path}","compare_url":"https://api.github.com/repos/networm/progit2-zh/compare/{base}...{head}","merges_url":"https://api.github.com/repos/networm/progit2-zh/merges","archive_url":"https://api.github.com/repos/networm/progit2-zh/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/networm/progit2-zh/downloads","issues_url":"https://api.github.com/repos/networm/progit2-zh/issues{/number}","pulls_url":"https://api.github.com/repos/networm/progit2-zh/pulls{/number}","milestones_url":"https://api.github.com/repos/networm/progit2-zh/milestones{/number}","notifications_url":"https://api.github.com/repos/networm/progit2-zh/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/networm/progit2-zh/labels{/name}","releases_url":"https://api.github.com/repos/networm/progit2-zh/releases{/id}","created_at":"2014-12-24T10:12:38Z","updated_at":"2015-08-07T00:14:42Z","pushed_at":"2015-08-08T16:08:09Z","git_url":"git://github.com/networm/progit2-zh.git","ssh_url":"git@github.com:networm/progit2-zh.git","clone_url":"https://github.com/networm/progit2-zh.git","svn_url":"https://github.com/networm/progit2-zh","homepage":null,"size":160284,"stargazers_count":6,"watchers_count":6,"language":"CSS","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":2,"mirror_url":null,"open_issues_count":0,"forks":2,"open_issues":0,"watchers":6,"default_branch":"master"}},"base":{"label":"progit:master","ref":"master","sha":"5d1559eefe4a24a1c1161fbcd1dda13f98941d16","user":{"login":"progit","id":95588,"avatar_url":"https://avatars.githubusercontent.com/u/95588?v=3","gravatar_id":"","url":"https://api.github.com/users/progit","html_url":"https://github.com/progit","followers_url":"https://api.github.com/users/progit/followers","following_url":"https://api.github.com/users/progit/following{/other_user}","gists_url":"https://api.github.com/users/progit/gists{/gist_id}","starred_url":"https://api.github.com/users/progit/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/progit/subscriptions","organizations_url":"https://api.github.com/users/progit/orgs","repos_url":"https://api.github.com/users/progit/repos","events_url":"https://api.github.com/users/progit/events{/privacy}","received_events_url":"https://api.github.com/users/progit/received_events","type":"Organization","site_admin":false},"repo":{"id":26017730,"name":"progit2-zh","full_name":"progit/progit2-zh","owner":{"login":"progit","id":95588,"avatar_url":"https://avatars.githubusercontent.com/u/95588?v=3","gravatar_id":"","url":"https://api.github.com/users/progit","html_url":"https://github.com/progit","followers_url":"https://api.github.com/users/progit/followers","following_url":"https://api.github.com/users/progit/following{/other_user}","gists_url":"https://api.github.com/users/progit/gists{/gist_id}","starred_url":"https://api.github.com/users/progit/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/progit/subscriptions","organizations_url":"https://api.github.com/users/progit/orgs","repos_url":"https://api.github.com/users/progit/repos","events_url":"https://api.github.com/users/progit/events{/privacy}","received_events_url":"https://api.github.com/users/progit/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/progit/progit2-zh","description":"","fork":false,"url":"https://api.github.com/repos/progit/progit2-zh","forks_url":"https://api.github.com/repos/progit/progit2-zh/forks","keys_url":"https://api.github.com/repos/progit/progit2-zh/keys{/key_id}","collaborators_url":"https://api.github.com/repos/progit/progit2-zh/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/progit/progit2-zh/teams","hooks_url":"https://api.github.com/repos/progit/progit2-zh/hooks","issue_events_url":"https://api.github.com/repos/progit/progit2-zh/issues/events{/number}","events_url":"https://api.github.com/repos/progit/progit2-zh/events","assignees_url":"https://api.github.com/repos/progit/progit2-zh/assignees{/user}","branches_url":"https://api.github.com/repos/progit/progit2-zh/branches{/branch}","tags_url":"https://api.github.com/repos/progit/progit2-zh/tags","blobs_url":"https://api.github.com/repos/progit/progit2-zh/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/progit/progit2-zh/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/progit/progit2-zh/git/refs{/sha}","trees_url":"https://api.github.com/repos/progit/progit2-zh/git/trees{/sha}","statuses_url":"https://api.github.com/repos/progit/progit2-zh/statuses/{sha}","languages_url":"https://api.github.com/repos/progit/progit2-zh/languages","stargazers_url":"https://api.github.com/repos/progit/progit2-zh/stargazers","contributors_url":"https://api.github.com/repos/progit/progit2-zh/contributors","subscribers_url":"https://api.github.com/repos/progit/progit2-zh/subscribers","subscription_url":"https://api.github.com/repos/progit/progit2-zh/subscription","commits_url":"https://api.github.com/repos/progit/progit2-zh/commits{/sha}","git_commits_url":"https://api.github.com/repos/progit/progit2-zh/git/commits{/sha}","comments_url":"https://api.github.com/repos/progit/progit2-zh/comments{/number}","issue_comment_url":"https://api.github.com/repos/progit/progit2-zh/issues/comments{/number}","contents_url":"https://api.github.com/repos/progit/progit2-zh/contents/{+path}","compare_url":"https://api.github.com/repos/progit/progit2-zh/compare/{base}...{head}","merges_url":"https://api.github.com/repos/progit/progit2-zh/merges","archive_url":"https://api.github.com/repos/progit/progit2-zh/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/progit/progit2-zh/downloads","issues_url":"https://api.github.com/repos/progit/progit2-zh/issues{/number}","pulls_url":"https://api.github.com/repos/progit/progit2-zh/pulls{/number}","milestones_url":"https://api.github.com/repos/progit/progit2-zh/milestones{/number}","notifications_url":"https://api.github.com/repos/progit/progit2-zh/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/progit/progit2-zh/labels{/name}","releases_url":"https://api.github.com/repos/progit/progit2-zh/releases{/id}","created_at":"2014-10-31T13:43:10Z","updated_at":"2015-08-09T14:01:52Z","pushed_at":"2015-08-09T04:46:43Z","git_url":"git://github.com/progit/progit2-zh.git","ssh_url":"git@github.com:progit/progit2-zh.git","clone_url":"https://github.com/progit/progit2-zh.git","svn_url":"https://github.com/progit/progit2-zh","homepage":null,"size":162059,"stargazers_count":298,"watchers_count":298,"language":"CSS","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":102,"mirror_url":null,"open_issues_count":41,"forks":102,"open_issues":41,"watchers":298,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/progit/progit2-zh/pulls/169"},"html":{"href":"https://github.com/progit/progit2-zh/pull/169"},"issue":{"href":"https://api.github.com/repos/progit/progit2-zh/issues/169"},"comments":{"href":"https://api.github.com/repos/progit/progit2-zh/issues/169/comments"},"review_comments":{"href":"https://api.github.com/repos/progit/progit2-zh/pulls/169/comments"},"review_comment":{"href":"https://api.github.com/repos/progit/progit2-zh/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/progit/progit2-zh/pulls/169/commits"},"statuses":{"href":"https://api.github.com/repos/progit/progit2-zh/statuses/f9ab00b74ef7f7623c33d33ddd6ea6a362cfcf11"}}}}