{"action":"created","comment":{"url":"https://api.github.com/repos/progit/progit2-zh/pulls/comments/32608292","id":32608292,"diff_hunk":"@@ -53,17 +53,18 @@ $ vim index.html\n $ git commit -a -m 'added a new footer [issue 53]'\n ----\n \n-.The iss53 branch has moved forward with your work\n+.iss53 分支随着工作的进展向前推进\n image::images/basic-branching-3.png[The iss53 branch has moved forward with your work.]\n \n-Now you get the call that there is an issue with the web site, and you need to fix it immediately.\n-With Git, you don't have to deploy your fix along with the `iss53` changes you've made, and you don't have to put a lot of effort into reverting those changes before you can work on applying your fix to what is in production.\n-All you have to do is switch back to your `master` branch.\n+现在你接到那个电话，有个紧急问题等待你来解决。","path":"book/03-git-branching/sections/basic-branching-and-merging.asc","position":84,"original_position":84,"commit_id":"7a55e9349aa6da53a3142daa8d8120d818819963","original_commit_id":"7a55e9349aa6da53a3142daa8d8120d818819963","user":{"login":"archermind","id":1461331,"avatar_url":"https://avatars.githubusercontent.com/u/1461331?v=3","gravatar_id":"","url":"https://api.github.com/users/archermind","html_url":"https://github.com/archermind","followers_url":"https://api.github.com/users/archermind/followers","following_url":"https://api.github.com/users/archermind/following{/other_user}","gists_url":"https://api.github.com/users/archermind/gists{/gist_id}","starred_url":"https://api.github.com/users/archermind/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/archermind/subscriptions","organizations_url":"https://api.github.com/users/archermind/orgs","repos_url":"https://api.github.com/users/archermind/repos","events_url":"https://api.github.com/users/archermind/events{/privacy}","received_events_url":"https://api.github.com/users/archermind/received_events","type":"User","site_admin":false},"body":"这个我故意翻译成`那个电话`的，因为，这篇一开始就讲到了，模拟一种工作场景：\r\n\r\n. 接到电话，解决紧急问题，bla bla...\r\n\r\n\r\n那么后面，就全部是围绕这个假设的场景展开的，所以我在这里用`那个电话`指代了最开始的`一个电话`。\r\n\r\n翻译这段的时候，我确实耍了点 小聪明....\r\n","created_at":"2015-06-17T09:20:26Z","updated_at":"2015-06-17T09:20:26Z","html_url":"https://github.com/progit/progit2-zh/pull/100#discussion_r32608292","pull_request_url":"https://api.github.com/repos/progit/progit2-zh/pulls/100","_links":{"self":{"href":"https://api.github.com/repos/progit/progit2-zh/pulls/comments/32608292"},"html":{"href":"https://github.com/progit/progit2-zh/pull/100#discussion_r32608292"},"pull_request":{"href":"https://api.github.com/repos/progit/progit2-zh/pulls/100"}}},"pull_request":{"url":"https://api.github.com/repos/progit/progit2-zh/pulls/100","id":37869859,"html_url":"https://github.com/progit/progit2-zh/pull/100","diff_url":"https://github.com/progit/progit2-zh/pull/100.diff","patch_url":"https://github.com/progit/progit2-zh/pull/100.patch","issue_url":"https://api.github.com/repos/progit/progit2-zh/issues/100","number":100,"state":"open","locked":false,"title":"Translate 03-git-branch/sections/basic-branch-and-merging","user":{"login":"archermind","id":1461331,"avatar_url":"https://avatars.githubusercontent.com/u/1461331?v=3","gravatar_id":"","url":"https://api.github.com/users/archermind","html_url":"https://github.com/archermind","followers_url":"https://api.github.com/users/archermind/followers","following_url":"https://api.github.com/users/archermind/following{/other_user}","gists_url":"https://api.github.com/users/archermind/gists{/gist_id}","starred_url":"https://api.github.com/users/archermind/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/archermind/subscriptions","organizations_url":"https://api.github.com/users/archermind/orgs","repos_url":"https://api.github.com/users/archermind/repos","events_url":"https://api.github.com/users/archermind/events{/privacy}","received_events_url":"https://api.github.com/users/archermind/received_events","type":"User","site_admin":false},"body":"Translate 03-git-branch/sections/basic-branch-and-merging completed\r\n\r\nPlease review @networm @tonghuix @devbean ","created_at":"2015-06-17T06:41:01Z","updated_at":"2015-06-17T09:20:26Z","closed_at":null,"merged_at":null,"merge_commit_sha":"df0431f139529a2cfd5cbe3aa0ec1a8c1fe5f0c8","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/progit/progit2-zh/pulls/100/commits","review_comments_url":"https://api.github.com/repos/progit/progit2-zh/pulls/100/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/100/comments","statuses_url":"https://api.github.com/repos/progit/progit2-zh/statuses/7a55e9349aa6da53a3142daa8d8120d818819963","head":{"label":"archermind:work_at_chapter-03","ref":"work_at_chapter-03","sha":"7a55e9349aa6da53a3142daa8d8120d818819963","user":{"login":"archermind","id":1461331,"avatar_url":"https://avatars.githubusercontent.com/u/1461331?v=3","gravatar_id":"","url":"https://api.github.com/users/archermind","html_url":"https://github.com/archermind","followers_url":"https://api.github.com/users/archermind/followers","following_url":"https://api.github.com/users/archermind/following{/other_user}","gists_url":"https://api.github.com/users/archermind/gists{/gist_id}","starred_url":"https://api.github.com/users/archermind/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/archermind/subscriptions","organizations_url":"https://api.github.com/users/archermind/orgs","repos_url":"https://api.github.com/users/archermind/repos","events_url":"https://api.github.com/users/archermind/events{/privacy}","received_events_url":"https://api.github.com/users/archermind/received_events","type":"User","site_admin":false},"repo":{"id":36782652,"name":"progit2-zh","full_name":"archermind/progit2-zh","owner":{"login":"archermind","id":1461331,"avatar_url":"https://avatars.githubusercontent.com/u/1461331?v=3","gravatar_id":"","url":"https://api.github.com/users/archermind","html_url":"https://github.com/archermind","followers_url":"https://api.github.com/users/archermind/followers","following_url":"https://api.github.com/users/archermind/following{/other_user}","gists_url":"https://api.github.com/users/archermind/gists{/gist_id}","starred_url":"https://api.github.com/users/archermind/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/archermind/subscriptions","organizations_url":"https://api.github.com/users/archermind/orgs","repos_url":"https://api.github.com/users/archermind/repos","events_url":"https://api.github.com/users/archermind/events{/privacy}","received_events_url":"https://api.github.com/users/archermind/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/archermind/progit2-zh","description":"","fork":true,"url":"https://api.github.com/repos/archermind/progit2-zh","forks_url":"https://api.github.com/repos/archermind/progit2-zh/forks","keys_url":"https://api.github.com/repos/archermind/progit2-zh/keys{/key_id}","collaborators_url":"https://api.github.com/repos/archermind/progit2-zh/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/archermind/progit2-zh/teams","hooks_url":"https://api.github.com/repos/archermind/progit2-zh/hooks","issue_events_url":"https://api.github.com/repos/archermind/progit2-zh/issues/events{/number}","events_url":"https://api.github.com/repos/archermind/progit2-zh/events","assignees_url":"https://api.github.com/repos/archermind/progit2-zh/assignees{/user}","branches_url":"https://api.github.com/repos/archermind/progit2-zh/branches{/branch}","tags_url":"https://api.github.com/repos/archermind/progit2-zh/tags","blobs_url":"https://api.github.com/repos/archermind/progit2-zh/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/archermind/progit2-zh/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/archermind/progit2-zh/git/refs{/sha}","trees_url":"https://api.github.com/repos/archermind/progit2-zh/git/trees{/sha}","statuses_url":"https://api.github.com/repos/archermind/progit2-zh/statuses/{sha}","languages_url":"https://api.github.com/repos/archermind/progit2-zh/languages","stargazers_url":"https://api.github.com/repos/archermind/progit2-zh/stargazers","contributors_url":"https://api.github.com/repos/archermind/progit2-zh/contributors","subscribers_url":"https://api.github.com/repos/archermind/progit2-zh/subscribers","subscription_url":"https://api.github.com/repos/archermind/progit2-zh/subscription","commits_url":"https://api.github.com/repos/archermind/progit2-zh/commits{/sha}","git_commits_url":"https://api.github.com/repos/archermind/progit2-zh/git/commits{/sha}","comments_url":"https://api.github.com/repos/archermind/progit2-zh/comments{/number}","issue_comment_url":"https://api.github.com/repos/archermind/progit2-zh/issues/comments{/number}","contents_url":"https://api.github.com/repos/archermind/progit2-zh/contents/{+path}","compare_url":"https://api.github.com/repos/archermind/progit2-zh/compare/{base}...{head}","merges_url":"https://api.github.com/repos/archermind/progit2-zh/merges","archive_url":"https://api.github.com/repos/archermind/progit2-zh/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/archermind/progit2-zh/downloads","issues_url":"https://api.github.com/repos/archermind/progit2-zh/issues{/number}","pulls_url":"https://api.github.com/repos/archermind/progit2-zh/pulls{/number}","milestones_url":"https://api.github.com/repos/archermind/progit2-zh/milestones{/number}","notifications_url":"https://api.github.com/repos/archermind/progit2-zh/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/archermind/progit2-zh/labels{/name}","releases_url":"https://api.github.com/repos/archermind/progit2-zh/releases{/id}","created_at":"2015-06-03T05:45:10Z","updated_at":"2015-06-03T05:45:12Z","pushed_at":"2015-06-17T06:39:53Z","git_url":"git://github.com/archermind/progit2-zh.git","ssh_url":"git@github.com:archermind/progit2-zh.git","clone_url":"https://github.com/archermind/progit2-zh.git","svn_url":"https://github.com/archermind/progit2-zh","homepage":null,"size":159651,"stargazers_count":0,"watchers_count":0,"language":"CSS","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"progit:master","ref":"master","sha":"af9ee732e6977aa621e30c8ceb152375f0911346","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-06-17T09:11:36Z","pushed_at":"2015-06-17T09:13:30Z","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":160388,"stargazers_count":195,"watchers_count":195,"language":"CSS","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":83,"mirror_url":null,"open_issues_count":31,"forks":83,"open_issues":31,"watchers":195,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/progit/progit2-zh/pulls/100"},"html":{"href":"https://github.com/progit/progit2-zh/pull/100"},"issue":{"href":"https://api.github.com/repos/progit/progit2-zh/issues/100"},"comments":{"href":"https://api.github.com/repos/progit/progit2-zh/issues/100/comments"},"review_comments":{"href":"https://api.github.com/repos/progit/progit2-zh/pulls/100/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/100/commits"},"statuses":{"href":"https://api.github.com/repos/progit/progit2-zh/statuses/7a55e9349aa6da53a3142daa8d8120d818819963"}}}}