{"action":"created","comment":{"url":"https://api.github.com/repos/progit2-tl/progit2/pulls/comments/167697074","pull_request_review_id":95953721,"id":167697074,"diff_hunk":"@@ -1,16 +1,16 @@\n [[_advanced_merging]]\n-=== Advanced Merging\n+=== Advanced na Merging\n \n-Merging in Git is typically fairly easy.\n-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+Ang merging sa Git ay karaniwang medyo madali.","path":"book/07-git-tools/sections/advanced-merging.asc","position":7,"original_position":7,"commit_id":"4481faf2a3fee7fea5ddb8bb87e60c59192b5c9c","original_commit_id":"4a572042addf0ab07ca91bebe69102981ac7821b","user":{"login":"robin-ho","id":33503612,"avatar_url":"https://avatars1.githubusercontent.com/u/33503612?v=4","gravatar_id":"","url":"https://api.github.com/users/robin-ho","html_url":"https://github.com/robin-ho","followers_url":"https://api.github.com/users/robin-ho/followers","following_url":"https://api.github.com/users/robin-ho/following{/other_user}","gists_url":"https://api.github.com/users/robin-ho/gists{/gist_id}","starred_url":"https://api.github.com/users/robin-ho/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/robin-ho/subscriptions","organizations_url":"https://api.github.com/users/robin-ho/orgs","repos_url":"https://api.github.com/users/robin-ho/repos","events_url":"https://api.github.com/users/robin-ho/events{/privacy}","received_events_url":"https://api.github.com/users/robin-ho/received_events","type":"User","site_admin":false},"body":"done change","created_at":"2018-02-12T21:48:15Z","updated_at":"2018-02-12T21:48:15Z","html_url":"https://github.com/progit2-tl/progit2/pull/28#discussion_r167697074","pull_request_url":"https://api.github.com/repos/progit2-tl/progit2/pulls/28","author_association":"NONE","_links":{"self":{"href":"https://api.github.com/repos/progit2-tl/progit2/pulls/comments/167697074"},"html":{"href":"https://github.com/progit2-tl/progit2/pull/28#discussion_r167697074"},"pull_request":{"href":"https://api.github.com/repos/progit2-tl/progit2/pulls/28"}},"in_reply_to_id":167602294},"pull_request":{"url":"https://api.github.com/repos/progit2-tl/progit2/pulls/28","id":168591599,"html_url":"https://github.com/progit2-tl/progit2/pull/28","diff_url":"https://github.com/progit2-tl/progit2/pull/28.diff","patch_url":"https://github.com/progit2-tl/progit2/pull/28.patch","issue_url":"https://api.github.com/repos/progit2-tl/progit2/issues/28","number":28,"state":"open","locked":false,"title":"Filipino Translation - 1113 translated words","user":{"login":"robin-ho","id":33503612,"avatar_url":"https://avatars1.githubusercontent.com/u/33503612?v=4","gravatar_id":"","url":"https://api.github.com/users/robin-ho","html_url":"https://github.com/robin-ho","followers_url":"https://api.github.com/users/robin-ho/followers","following_url":"https://api.github.com/users/robin-ho/following{/other_user}","gists_url":"https://api.github.com/users/robin-ho/gists{/gist_id}","starred_url":"https://api.github.com/users/robin-ho/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/robin-ho/subscriptions","organizations_url":"https://api.github.com/users/robin-ho/orgs","repos_url":"https://api.github.com/users/robin-ho/repos","events_url":"https://api.github.com/users/robin-ho/events{/privacy}","received_events_url":"https://api.github.com/users/robin-ho/received_events","type":"User","site_admin":false},"body":"recording-changes.asc - 618 translated words\r\n1-git-tools.asc - 174 translated words\r\nadvanced-merging.asc - 321 translated words\r\n\r\nCode text and computer code text are not counted as translated words.","created_at":"2018-02-12T14:25:12Z","updated_at":"2018-02-12T21:48:15Z","closed_at":null,"merged_at":null,"merge_commit_sha":"1dd3b89465f96c05dbb98984445194c596c02139","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/progit2-tl/progit2/pulls/28/commits","review_comments_url":"https://api.github.com/repos/progit2-tl/progit2/pulls/28/comments","review_comment_url":"https://api.github.com/repos/progit2-tl/progit2/pulls/comments{/number}","comments_url":"https://api.github.com/repos/progit2-tl/progit2/issues/28/comments","statuses_url":"https://api.github.com/repos/progit2-tl/progit2/statuses/4481faf2a3fee7fea5ddb8bb87e60c59192b5c9c","head":{"label":"robin-ho:master","ref":"master","sha":"4481faf2a3fee7fea5ddb8bb87e60c59192b5c9c","user":{"login":"robin-ho","id":33503612,"avatar_url":"https://avatars1.githubusercontent.com/u/33503612?v=4","gravatar_id":"","url":"https://api.github.com/users/robin-ho","html_url":"https://github.com/robin-ho","followers_url":"https://api.github.com/users/robin-ho/followers","following_url":"https://api.github.com/users/robin-ho/following{/other_user}","gists_url":"https://api.github.com/users/robin-ho/gists{/gist_id}","starred_url":"https://api.github.com/users/robin-ho/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/robin-ho/subscriptions","organizations_url":"https://api.github.com/users/robin-ho/orgs","repos_url":"https://api.github.com/users/robin-ho/repos","events_url":"https://api.github.com/users/robin-ho/events{/privacy}","received_events_url":"https://api.github.com/users/robin-ho/received_events","type":"User","site_admin":false},"repo":{"id":120728366,"name":"progit2","full_name":"robin-ho/progit2","owner":{"login":"robin-ho","id":33503612,"avatar_url":"https://avatars1.githubusercontent.com/u/33503612?v=4","gravatar_id":"","url":"https://api.github.com/users/robin-ho","html_url":"https://github.com/robin-ho","followers_url":"https://api.github.com/users/robin-ho/followers","following_url":"https://api.github.com/users/robin-ho/following{/other_user}","gists_url":"https://api.github.com/users/robin-ho/gists{/gist_id}","starred_url":"https://api.github.com/users/robin-ho/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/robin-ho/subscriptions","organizations_url":"https://api.github.com/users/robin-ho/orgs","repos_url":"https://api.github.com/users/robin-ho/repos","events_url":"https://api.github.com/users/robin-ho/events{/privacy}","received_events_url":"https://api.github.com/users/robin-ho/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/robin-ho/progit2","description":"Pro Git 2nd Edition - Offical Repository for Tagalog Translations","fork":true,"url":"https://api.github.com/repos/robin-ho/progit2","forks_url":"https://api.github.com/repos/robin-ho/progit2/forks","keys_url":"https://api.github.com/repos/robin-ho/progit2/keys{/key_id}","collaborators_url":"https://api.github.com/repos/robin-ho/progit2/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/robin-ho/progit2/teams","hooks_url":"https://api.github.com/repos/robin-ho/progit2/hooks","issue_events_url":"https://api.github.com/repos/robin-ho/progit2/issues/events{/number}","events_url":"https://api.github.com/repos/robin-ho/progit2/events","assignees_url":"https://api.github.com/repos/robin-ho/progit2/assignees{/user}","branches_url":"https://api.github.com/repos/robin-ho/progit2/branches{/branch}","tags_url":"https://api.github.com/repos/robin-ho/progit2/tags","blobs_url":"https://api.github.com/repos/robin-ho/progit2/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/robin-ho/progit2/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/robin-ho/progit2/git/refs{/sha}","trees_url":"https://api.github.com/repos/robin-ho/progit2/git/trees{/sha}","statuses_url":"https://api.github.com/repos/robin-ho/progit2/statuses/{sha}","languages_url":"https://api.github.com/repos/robin-ho/progit2/languages","stargazers_url":"https://api.github.com/repos/robin-ho/progit2/stargazers","contributors_url":"https://api.github.com/repos/robin-ho/progit2/contributors","subscribers_url":"https://api.github.com/repos/robin-ho/progit2/subscribers","subscription_url":"https://api.github.com/repos/robin-ho/progit2/subscription","commits_url":"https://api.github.com/repos/robin-ho/progit2/commits{/sha}","git_commits_url":"https://api.github.com/repos/robin-ho/progit2/git/commits{/sha}","comments_url":"https://api.github.com/repos/robin-ho/progit2/comments{/number}","issue_comment_url":"https://api.github.com/repos/robin-ho/progit2/issues/comments{/number}","contents_url":"https://api.github.com/repos/robin-ho/progit2/contents/{+path}","compare_url":"https://api.github.com/repos/robin-ho/progit2/compare/{base}...{head}","merges_url":"https://api.github.com/repos/robin-ho/progit2/merges","archive_url":"https://api.github.com/repos/robin-ho/progit2/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/robin-ho/progit2/downloads","issues_url":"https://api.github.com/repos/robin-ho/progit2/issues{/number}","pulls_url":"https://api.github.com/repos/robin-ho/progit2/pulls{/number}","milestones_url":"https://api.github.com/repos/robin-ho/progit2/milestones{/number}","notifications_url":"https://api.github.com/repos/robin-ho/progit2/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/robin-ho/progit2/labels{/name}","releases_url":"https://api.github.com/repos/robin-ho/progit2/releases{/id}","deployments_url":"https://api.github.com/repos/robin-ho/progit2/deployments","created_at":"2018-02-08T07:45:32Z","updated_at":"2018-02-08T07:45:34Z","pushed_at":"2018-02-12T21:47:19Z","git_url":"git://github.com/robin-ho/progit2.git","ssh_url":"git@github.com:robin-ho/progit2.git","clone_url":"https://github.com/robin-ho/progit2.git","svn_url":"https://github.com/robin-ho/progit2","homepage":"https://git-scm.com/book/tl/v2","size":173821,"stargazers_count":0,"watchers_count":0,"language":"CSS","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":0,"license":{"key":"other","name":"Other","spdx_id":null,"url":null},"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"progit2-tl:master","ref":"master","sha":"274612eecfb69dad6ce3006b3108eb4398e69ace","user":{"login":"progit2-tl","id":36065195,"avatar_url":"https://avatars1.githubusercontent.com/u/36065195?v=4","gravatar_id":"","url":"https://api.github.com/users/progit2-tl","html_url":"https://github.com/progit2-tl","followers_url":"https://api.github.com/users/progit2-tl/followers","following_url":"https://api.github.com/users/progit2-tl/following{/other_user}","gists_url":"https://api.github.com/users/progit2-tl/gists{/gist_id}","starred_url":"https://api.github.com/users/progit2-tl/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/progit2-tl/subscriptions","organizations_url":"https://api.github.com/users/progit2-tl/orgs","repos_url":"https://api.github.com/users/progit2-tl/repos","events_url":"https://api.github.com/users/progit2-tl/events{/privacy}","received_events_url":"https://api.github.com/users/progit2-tl/received_events","type":"Organization","site_admin":false},"repo":{"id":119943199,"name":"progit2","full_name":"progit2-tl/progit2","owner":{"login":"progit2-tl","id":36065195,"avatar_url":"https://avatars1.githubusercontent.com/u/36065195?v=4","gravatar_id":"","url":"https://api.github.com/users/progit2-tl","html_url":"https://github.com/progit2-tl","followers_url":"https://api.github.com/users/progit2-tl/followers","following_url":"https://api.github.com/users/progit2-tl/following{/other_user}","gists_url":"https://api.github.com/users/progit2-tl/gists{/gist_id}","starred_url":"https://api.github.com/users/progit2-tl/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/progit2-tl/subscriptions","organizations_url":"https://api.github.com/users/progit2-tl/orgs","repos_url":"https://api.github.com/users/progit2-tl/repos","events_url":"https://api.github.com/users/progit2-tl/events{/privacy}","received_events_url":"https://api.github.com/users/progit2-tl/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/progit2-tl/progit2","description":"Pro Git 2nd Edition - Offical Repository for Tagalog Translations","fork":true,"url":"https://api.github.com/repos/progit2-tl/progit2","forks_url":"https://api.github.com/repos/progit2-tl/progit2/forks","keys_url":"https://api.github.com/repos/progit2-tl/progit2/keys{/key_id}","collaborators_url":"https://api.github.com/repos/progit2-tl/progit2/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/progit2-tl/progit2/teams","hooks_url":"https://api.github.com/repos/progit2-tl/progit2/hooks","issue_events_url":"https://api.github.com/repos/progit2-tl/progit2/issues/events{/number}","events_url":"https://api.github.com/repos/progit2-tl/progit2/events","assignees_url":"https://api.github.com/repos/progit2-tl/progit2/assignees{/user}","branches_url":"https://api.github.com/repos/progit2-tl/progit2/branches{/branch}","tags_url":"https://api.github.com/repos/progit2-tl/progit2/tags","blobs_url":"https://api.github.com/repos/progit2-tl/progit2/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/progit2-tl/progit2/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/progit2-tl/progit2/git/refs{/sha}","trees_url":"https://api.github.com/repos/progit2-tl/progit2/git/trees{/sha}","statuses_url":"https://api.github.com/repos/progit2-tl/progit2/statuses/{sha}","languages_url":"https://api.github.com/repos/progit2-tl/progit2/languages","stargazers_url":"https://api.github.com/repos/progit2-tl/progit2/stargazers","contributors_url":"https://api.github.com/repos/progit2-tl/progit2/contributors","subscribers_url":"https://api.github.com/repos/progit2-tl/progit2/subscribers","subscription_url":"https://api.github.com/repos/progit2-tl/progit2/subscription","commits_url":"https://api.github.com/repos/progit2-tl/progit2/commits{/sha}","git_commits_url":"https://api.github.com/repos/progit2-tl/progit2/git/commits{/sha}","comments_url":"https://api.github.com/repos/progit2-tl/progit2/comments{/number}","issue_comment_url":"https://api.github.com/repos/progit2-tl/progit2/issues/comments{/number}","contents_url":"https://api.github.com/repos/progit2-tl/progit2/contents/{+path}","compare_url":"https://api.github.com/repos/progit2-tl/progit2/compare/{base}...{head}","merges_url":"https://api.github.com/repos/progit2-tl/progit2/merges","archive_url":"https://api.github.com/repos/progit2-tl/progit2/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/progit2-tl/progit2/downloads","issues_url":"https://api.github.com/repos/progit2-tl/progit2/issues{/number}","pulls_url":"https://api.github.com/repos/progit2-tl/progit2/pulls{/number}","milestones_url":"https://api.github.com/repos/progit2-tl/progit2/milestones{/number}","notifications_url":"https://api.github.com/repos/progit2-tl/progit2/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/progit2-tl/progit2/labels{/name}","releases_url":"https://api.github.com/repos/progit2-tl/progit2/releases{/id}","deployments_url":"https://api.github.com/repos/progit2-tl/progit2/deployments","created_at":"2018-02-02T06:39:38Z","updated_at":"2018-02-07T17:10:18Z","pushed_at":"2018-02-12T21:47:21Z","git_url":"git://github.com/progit2-tl/progit2.git","ssh_url":"git@github.com:progit2-tl/progit2.git","clone_url":"https://github.com/progit2-tl/progit2.git","svn_url":"https://github.com/progit2-tl/progit2","homepage":"https://git-scm.com/book/tl/v2","size":174076,"stargazers_count":0,"watchers_count":0,"language":"CSS","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":17,"mirror_url":null,"archived":false,"open_issues_count":6,"license":null,"forks":17,"open_issues":6,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/progit2-tl/progit2/pulls/28"},"html":{"href":"https://github.com/progit2-tl/progit2/pull/28"},"issue":{"href":"https://api.github.com/repos/progit2-tl/progit2/issues/28"},"comments":{"href":"https://api.github.com/repos/progit2-tl/progit2/issues/28/comments"},"review_comments":{"href":"https://api.github.com/repos/progit2-tl/progit2/pulls/28/comments"},"review_comment":{"href":"https://api.github.com/repos/progit2-tl/progit2/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/progit2-tl/progit2/pulls/28/commits"},"statuses":{"href":"https://api.github.com/repos/progit2-tl/progit2/statuses/4481faf2a3fee7fea5ddb8bb87e60c59192b5c9c"}},"author_association":"NONE"}}
{"actor":{"display_login":"robin-ho"}}