{"action":"created","comment":{"url":"https://api.github.com/repos/whatwg/html/pulls/comments/58344772","id":58344772,"diff_hunk":"@@ -73,7 +75,11 @@ Before pushing, you should amend the commit message with a final line containing\n \n ### Merging pull requests from branches\n \n-Pull requests from other editors or members of the WHATWG GitHub organization may come from branches within this repository. To merge these cleanly, we add an extra step:\n+Pull requests from other editors or members of the WHATWG GitHub organization may come from branches within this repository.\n+\n+But just as with PRs from forks, you can merge PRs from branches in this repo to the master branch just using the normal green button (labeled **Merge pull request**) in the pull-request page in the GitHub Web UI. After you press that, another green button will appear, labeled **Confirm squash and merge**. Press that and all the commits from that PR branch will be combined into one commit to the master branch.\n+\n+Otherwise, if you want to cleanly merge a PRs from branches within the repo using the command line, you need to add an extra step in addition to the steps you'd follow for merging a PR from a fork. These are the steps:","path":"TEAM.md","position":20,"original_position":20,"commit_id":"96fddc01e46a97e5af7cea1523fc8421407e5829","original_commit_id":"96fddc01e46a97e5af7cea1523fc8421407e5829","user":{"login":"zcorpan","id":244772,"avatar_url":"https://avatars.githubusercontent.com/u/244772?v=3","gravatar_id":"","url":"https://api.github.com/users/zcorpan","html_url":"https://github.com/zcorpan","followers_url":"https://api.github.com/users/zcorpan/followers","following_url":"https://api.github.com/users/zcorpan/following{/other_user}","gists_url":"https://api.github.com/users/zcorpan/gists{/gist_id}","starred_url":"https://api.github.com/users/zcorpan/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zcorpan/subscriptions","organizations_url":"https://api.github.com/users/zcorpan/orgs","repos_url":"https://api.github.com/users/zcorpan/repos","events_url":"https://api.github.com/users/zcorpan/events{/privacy}","received_events_url":"https://api.github.com/users/zcorpan/received_events","type":"User","site_admin":false},"body":"s/PRs/PR/","created_at":"2016-04-04T08:52:40Z","updated_at":"2016-04-04T08:52:40Z","html_url":"https://github.com/whatwg/html/pull/984#discussion_r58344772","pull_request_url":"https://api.github.com/repos/whatwg/html/pulls/984","_links":{"self":{"href":"https://api.github.com/repos/whatwg/html/pulls/comments/58344772"},"html":{"href":"https://github.com/whatwg/html/pull/984#discussion_r58344772"},"pull_request":{"href":"https://api.github.com/repos/whatwg/html/pulls/984"}}},"pull_request":{"url":"https://api.github.com/repos/whatwg/html/pulls/984","id":65052653,"html_url":"https://github.com/whatwg/html/pull/984","diff_url":"https://github.com/whatwg/html/pull/984.diff","patch_url":"https://github.com/whatwg/html/pull/984.patch","issue_url":"https://api.github.com/repos/whatwg/html/issues/984","number":984,"state":"open","locked":false,"title":"Meta: Update merge instructions further","user":{"login":"sideshowbarker","id":194984,"avatar_url":"https://avatars.githubusercontent.com/u/194984?v=3","gravatar_id":"","url":"https://api.github.com/users/sideshowbarker","html_url":"https://github.com/sideshowbarker","followers_url":"https://api.github.com/users/sideshowbarker/followers","following_url":"https://api.github.com/users/sideshowbarker/following{/other_user}","gists_url":"https://api.github.com/users/sideshowbarker/gists{/gist_id}","starred_url":"https://api.github.com/users/sideshowbarker/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sideshowbarker/subscriptions","organizations_url":"https://api.github.com/users/sideshowbarker/orgs","repos_url":"https://api.github.com/users/sideshowbarker/repos","events_url":"https://api.github.com/users/sideshowbarker/events{/privacy}","received_events_url":"https://api.github.com/users/sideshowbarker/received_events","type":"User","site_admin":false},"body":"","created_at":"2016-04-02T22:48:36Z","updated_at":"2016-04-04T08:52:40Z","closed_at":null,"merged_at":null,"merge_commit_sha":"8e2b6a47fa65b378bf8c590a60daeae4c8cebe8c","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/whatwg/html/pulls/984/commits","review_comments_url":"https://api.github.com/repos/whatwg/html/pulls/984/comments","review_comment_url":"https://api.github.com/repos/whatwg/html/pulls/comments{/number}","comments_url":"https://api.github.com/repos/whatwg/html/issues/984/comments","statuses_url":"https://api.github.com/repos/whatwg/html/statuses/96fddc01e46a97e5af7cea1523fc8421407e5829","head":{"label":"whatwg:green-button","ref":"green-button","sha":"96fddc01e46a97e5af7cea1523fc8421407e5829","user":{"login":"whatwg","id":2226336,"avatar_url":"https://avatars.githubusercontent.com/u/2226336?v=3","gravatar_id":"","url":"https://api.github.com/users/whatwg","html_url":"https://github.com/whatwg","followers_url":"https://api.github.com/users/whatwg/followers","following_url":"https://api.github.com/users/whatwg/following{/other_user}","gists_url":"https://api.github.com/users/whatwg/gists{/gist_id}","starred_url":"https://api.github.com/users/whatwg/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/whatwg/subscriptions","organizations_url":"https://api.github.com/users/whatwg/orgs","repos_url":"https://api.github.com/users/whatwg/repos","events_url":"https://api.github.com/users/whatwg/events{/privacy}","received_events_url":"https://api.github.com/users/whatwg/received_events","type":"Organization","site_admin":false},"repo":{"id":11969507,"name":"html","full_name":"whatwg/html","owner":{"login":"whatwg","id":2226336,"avatar_url":"https://avatars.githubusercontent.com/u/2226336?v=3","gravatar_id":"","url":"https://api.github.com/users/whatwg","html_url":"https://github.com/whatwg","followers_url":"https://api.github.com/users/whatwg/followers","following_url":"https://api.github.com/users/whatwg/following{/other_user}","gists_url":"https://api.github.com/users/whatwg/gists{/gist_id}","starred_url":"https://api.github.com/users/whatwg/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/whatwg/subscriptions","organizations_url":"https://api.github.com/users/whatwg/orgs","repos_url":"https://api.github.com/users/whatwg/repos","events_url":"https://api.github.com/users/whatwg/events{/privacy}","received_events_url":"https://api.github.com/users/whatwg/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/whatwg/html","description":"HTML Standard","fork":false,"url":"https://api.github.com/repos/whatwg/html","forks_url":"https://api.github.com/repos/whatwg/html/forks","keys_url":"https://api.github.com/repos/whatwg/html/keys{/key_id}","collaborators_url":"https://api.github.com/repos/whatwg/html/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/whatwg/html/teams","hooks_url":"https://api.github.com/repos/whatwg/html/hooks","issue_events_url":"https://api.github.com/repos/whatwg/html/issues/events{/number}","events_url":"https://api.github.com/repos/whatwg/html/events","assignees_url":"https://api.github.com/repos/whatwg/html/assignees{/user}","branches_url":"https://api.github.com/repos/whatwg/html/branches{/branch}","tags_url":"https://api.github.com/repos/whatwg/html/tags","blobs_url":"https://api.github.com/repos/whatwg/html/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/whatwg/html/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/whatwg/html/git/refs{/sha}","trees_url":"https://api.github.com/repos/whatwg/html/git/trees{/sha}","statuses_url":"https://api.github.com/repos/whatwg/html/statuses/{sha}","languages_url":"https://api.github.com/repos/whatwg/html/languages","stargazers_url":"https://api.github.com/repos/whatwg/html/stargazers","contributors_url":"https://api.github.com/repos/whatwg/html/contributors","subscribers_url":"https://api.github.com/repos/whatwg/html/subscribers","subscription_url":"https://api.github.com/repos/whatwg/html/subscription","commits_url":"https://api.github.com/repos/whatwg/html/commits{/sha}","git_commits_url":"https://api.github.com/repos/whatwg/html/git/commits{/sha}","comments_url":"https://api.github.com/repos/whatwg/html/comments{/number}","issue_comment_url":"https://api.github.com/repos/whatwg/html/issues/comments{/number}","contents_url":"https://api.github.com/repos/whatwg/html/contents/{+path}","compare_url":"https://api.github.com/repos/whatwg/html/compare/{base}...{head}","merges_url":"https://api.github.com/repos/whatwg/html/merges","archive_url":"https://api.github.com/repos/whatwg/html/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/whatwg/html/downloads","issues_url":"https://api.github.com/repos/whatwg/html/issues{/number}","pulls_url":"https://api.github.com/repos/whatwg/html/pulls{/number}","milestones_url":"https://api.github.com/repos/whatwg/html/milestones{/number}","notifications_url":"https://api.github.com/repos/whatwg/html/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/whatwg/html/labels{/name}","releases_url":"https://api.github.com/repos/whatwg/html/releases{/id}","deployments_url":"https://api.github.com/repos/whatwg/html/deployments","created_at":"2013-08-08T06:26:07Z","updated_at":"2016-04-04T05:07:34Z","pushed_at":"2016-04-04T08:48:43Z","git_url":"git://github.com/whatwg/html.git","ssh_url":"git@github.com:whatwg/html.git","clone_url":"https://github.com/whatwg/html.git","svn_url":"https://github.com/whatwg/html","homepage":"https://html.spec.whatwg.org/multipage/","size":123962,"stargazers_count":548,"watchers_count":548,"language":"HTML","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":119,"mirror_url":null,"open_issues_count":249,"forks":119,"open_issues":249,"watchers":548,"default_branch":"master"}},"base":{"label":"whatwg:master","ref":"master","sha":"78806b0a466dd8f1f04fdcd5bc51ca002ccbf31f","user":{"login":"whatwg","id":2226336,"avatar_url":"https://avatars.githubusercontent.com/u/2226336?v=3","gravatar_id":"","url":"https://api.github.com/users/whatwg","html_url":"https://github.com/whatwg","followers_url":"https://api.github.com/users/whatwg/followers","following_url":"https://api.github.com/users/whatwg/following{/other_user}","gists_url":"https://api.github.com/users/whatwg/gists{/gist_id}","starred_url":"https://api.github.com/users/whatwg/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/whatwg/subscriptions","organizations_url":"https://api.github.com/users/whatwg/orgs","repos_url":"https://api.github.com/users/whatwg/repos","events_url":"https://api.github.com/users/whatwg/events{/privacy}","received_events_url":"https://api.github.com/users/whatwg/received_events","type":"Organization","site_admin":false},"repo":{"id":11969507,"name":"html","full_name":"whatwg/html","owner":{"login":"whatwg","id":2226336,"avatar_url":"https://avatars.githubusercontent.com/u/2226336?v=3","gravatar_id":"","url":"https://api.github.com/users/whatwg","html_url":"https://github.com/whatwg","followers_url":"https://api.github.com/users/whatwg/followers","following_url":"https://api.github.com/users/whatwg/following{/other_user}","gists_url":"https://api.github.com/users/whatwg/gists{/gist_id}","starred_url":"https://api.github.com/users/whatwg/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/whatwg/subscriptions","organizations_url":"https://api.github.com/users/whatwg/orgs","repos_url":"https://api.github.com/users/whatwg/repos","events_url":"https://api.github.com/users/whatwg/events{/privacy}","received_events_url":"https://api.github.com/users/whatwg/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/whatwg/html","description":"HTML Standard","fork":false,"url":"https://api.github.com/repos/whatwg/html","forks_url":"https://api.github.com/repos/whatwg/html/forks","keys_url":"https://api.github.com/repos/whatwg/html/keys{/key_id}","collaborators_url":"https://api.github.com/repos/whatwg/html/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/whatwg/html/teams","hooks_url":"https://api.github.com/repos/whatwg/html/hooks","issue_events_url":"https://api.github.com/repos/whatwg/html/issues/events{/number}","events_url":"https://api.github.com/repos/whatwg/html/events","assignees_url":"https://api.github.com/repos/whatwg/html/assignees{/user}","branches_url":"https://api.github.com/repos/whatwg/html/branches{/branch}","tags_url":"https://api.github.com/repos/whatwg/html/tags","blobs_url":"https://api.github.com/repos/whatwg/html/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/whatwg/html/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/whatwg/html/git/refs{/sha}","trees_url":"https://api.github.com/repos/whatwg/html/git/trees{/sha}","statuses_url":"https://api.github.com/repos/whatwg/html/statuses/{sha}","languages_url":"https://api.github.com/repos/whatwg/html/languages","stargazers_url":"https://api.github.com/repos/whatwg/html/stargazers","contributors_url":"https://api.github.com/repos/whatwg/html/contributors","subscribers_url":"https://api.github.com/repos/whatwg/html/subscribers","subscription_url":"https://api.github.com/repos/whatwg/html/subscription","commits_url":"https://api.github.com/repos/whatwg/html/commits{/sha}","git_commits_url":"https://api.github.com/repos/whatwg/html/git/commits{/sha}","comments_url":"https://api.github.com/repos/whatwg/html/comments{/number}","issue_comment_url":"https://api.github.com/repos/whatwg/html/issues/comments{/number}","contents_url":"https://api.github.com/repos/whatwg/html/contents/{+path}","compare_url":"https://api.github.com/repos/whatwg/html/compare/{base}...{head}","merges_url":"https://api.github.com/repos/whatwg/html/merges","archive_url":"https://api.github.com/repos/whatwg/html/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/whatwg/html/downloads","issues_url":"https://api.github.com/repos/whatwg/html/issues{/number}","pulls_url":"https://api.github.com/repos/whatwg/html/pulls{/number}","milestones_url":"https://api.github.com/repos/whatwg/html/milestones{/number}","notifications_url":"https://api.github.com/repos/whatwg/html/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/whatwg/html/labels{/name}","releases_url":"https://api.github.com/repos/whatwg/html/releases{/id}","deployments_url":"https://api.github.com/repos/whatwg/html/deployments","created_at":"2013-08-08T06:26:07Z","updated_at":"2016-04-04T05:07:34Z","pushed_at":"2016-04-04T08:48:43Z","git_url":"git://github.com/whatwg/html.git","ssh_url":"git@github.com:whatwg/html.git","clone_url":"https://github.com/whatwg/html.git","svn_url":"https://github.com/whatwg/html","homepage":"https://html.spec.whatwg.org/multipage/","size":123962,"stargazers_count":548,"watchers_count":548,"language":"HTML","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":119,"mirror_url":null,"open_issues_count":249,"forks":119,"open_issues":249,"watchers":548,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/whatwg/html/pulls/984"},"html":{"href":"https://github.com/whatwg/html/pull/984"},"issue":{"href":"https://api.github.com/repos/whatwg/html/issues/984"},"comments":{"href":"https://api.github.com/repos/whatwg/html/issues/984/comments"},"review_comments":{"href":"https://api.github.com/repos/whatwg/html/pulls/984/comments"},"review_comment":{"href":"https://api.github.com/repos/whatwg/html/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/whatwg/html/pulls/984/commits"},"statuses":{"href":"https://api.github.com/repos/whatwg/html/statuses/96fddc01e46a97e5af7cea1523fc8421407e5829"}}}}