{"action":"created","comment":{"url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/pulls/comments/221781097","pull_request_review_id":160514880,"id":221781097,"node_id":"MDI0OlB1bGxSZXF1ZXN0UmV2aWV3Q29tbWVudDIyMTc4MTA5Nw==","diff_hunk":"@@ -474,11 +474,22 @@ We **always use non-fast forward merges** so that the merge point is marked in G\n \n .. code-block:: bash\n \n+   # Prepare to merge\n+   git checkout master\n+   git pull  # Sanity check; if master is up-to-date, skip ahead to \"Merge\" below\n+   git checkout tickets/DM-NNNN\n+   git rebase master\n+   git push --force  # so that the commits on the remote branch match the commits merged*\n+   # Merge\n    git checkout master\n-   git pull  # Sanity check; rebase ticket if master was updated.\n    git merge --no-ff tickets/DM-NNNN\n    git push\n \n+We force push the rebased branch for three reasons:\n+(1) In many repos, branch protection requires that Travis was run on any commits before they can be pushed onto master","path":"work/flow.rst","position":17,"original_position":17,"commit_id":"5b3e9724883f0ed4e8ad0bc2d659a0521c733b86","original_commit_id":"5b3e9724883f0ed4e8ad0bc2d659a0521c733b86","user":{"login":"jonathansick","id":349384,"node_id":"MDQ6VXNlcjM0OTM4NA==","avatar_url":"https://avatars3.githubusercontent.com/u/349384?v=4","gravatar_id":"","url":"https://api.github.com/users/jonathansick","html_url":"https://github.com/jonathansick","followers_url":"https://api.github.com/users/jonathansick/followers","following_url":"https://api.github.com/users/jonathansick/following{/other_user}","gists_url":"https://api.github.com/users/jonathansick/gists{/gist_id}","starred_url":"https://api.github.com/users/jonathansick/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jonathansick/subscriptions","organizations_url":"https://api.github.com/users/jonathansick/orgs","repos_url":"https://api.github.com/users/jonathansick/repos","events_url":"https://api.github.com/users/jonathansick/events{/privacy}","received_events_url":"https://api.github.com/users/jonathansick/received_events","type":"User","site_admin":false},"body":"This numbering syntax won't work. Try:\r\n\r\n```rst\r\nWe force push the rebased branch for three reasons:\r\n\r\n1. In many repos, GitHub branch protection requires that Travis was run on any commits before they can be pushed onto master. Branch protections also require that the branch is up-to-date with `master` before a merge is allowed.\r\n2. The policy is to delete branches that have been merged. This is only possible if the exact commit has been merged.\r\n3. For convenience, GitHub will automatically close pull requests if the corresponding branch has been merged to master.\r\n```\r\n\r\n(see a few copy edits too)","created_at":"2018-10-01T22:50:25Z","updated_at":"2018-10-01T22:56:58Z","html_url":"https://github.com/lsst-dm/dm_dev_guide/pull/267#discussion_r221781097","pull_request_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/pulls/267","author_association":"CONTRIBUTOR","_links":{"self":{"href":"https://api.github.com/repos/lsst-dm/dm_dev_guide/pulls/comments/221781097"},"html":{"href":"https://github.com/lsst-dm/dm_dev_guide/pull/267#discussion_r221781097"},"pull_request":{"href":"https://api.github.com/repos/lsst-dm/dm_dev_guide/pulls/267"}}},"pull_request":{"url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/pulls/267","id":219534606,"node_id":"MDExOlB1bGxSZXF1ZXN0MjE5NTM0NjA2","html_url":"https://github.com/lsst-dm/dm_dev_guide/pull/267","diff_url":"https://github.com/lsst-dm/dm_dev_guide/pull/267.diff","patch_url":"https://github.com/lsst-dm/dm_dev_guide/pull/267.patch","issue_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/issues/267","number":267,"state":"open","locked":false,"title":"Add instructions to rebase and push branch before merging","user":{"login":"yalsayyad","id":3037620,"node_id":"MDQ6VXNlcjMwMzc2MjA=","avatar_url":"https://avatars3.githubusercontent.com/u/3037620?v=4","gravatar_id":"","url":"https://api.github.com/users/yalsayyad","html_url":"https://github.com/yalsayyad","followers_url":"https://api.github.com/users/yalsayyad/followers","following_url":"https://api.github.com/users/yalsayyad/following{/other_user}","gists_url":"https://api.github.com/users/yalsayyad/gists{/gist_id}","starred_url":"https://api.github.com/users/yalsayyad/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/yalsayyad/subscriptions","organizations_url":"https://api.github.com/users/yalsayyad/orgs","repos_url":"https://api.github.com/users/yalsayyad/repos","events_url":"https://api.github.com/users/yalsayyad/events{/privacy}","received_events_url":"https://api.github.com/users/yalsayyad/received_events","type":"User","site_admin":false},"body":"","created_at":"2018-10-01T22:26:27Z","updated_at":"2018-10-01T22:56:58Z","closed_at":null,"merged_at":null,"merge_commit_sha":"7dac7f0681c5aa818c9d6166fb0321e6f9051fe0","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/pulls/267/commits","review_comments_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/pulls/267/comments","review_comment_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/pulls/comments{/number}","comments_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/issues/267/comments","statuses_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/statuses/5b3e9724883f0ed4e8ad0bc2d659a0521c733b86","head":{"label":"lsst-dm:tickets/DM-15548","ref":"tickets/DM-15548","sha":"5b3e9724883f0ed4e8ad0bc2d659a0521c733b86","user":{"login":"lsst-dm","id":10968870,"node_id":"MDEyOk9yZ2FuaXphdGlvbjEwOTY4ODcw","avatar_url":"https://avatars1.githubusercontent.com/u/10968870?v=4","gravatar_id":"","url":"https://api.github.com/users/lsst-dm","html_url":"https://github.com/lsst-dm","followers_url":"https://api.github.com/users/lsst-dm/followers","following_url":"https://api.github.com/users/lsst-dm/following{/other_user}","gists_url":"https://api.github.com/users/lsst-dm/gists{/gist_id}","starred_url":"https://api.github.com/users/lsst-dm/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lsst-dm/subscriptions","organizations_url":"https://api.github.com/users/lsst-dm/orgs","repos_url":"https://api.github.com/users/lsst-dm/repos","events_url":"https://api.github.com/users/lsst-dm/events{/privacy}","received_events_url":"https://api.github.com/users/lsst-dm/received_events","type":"Organization","site_admin":false},"repo":{"id":40620718,"node_id":"MDEwOlJlcG9zaXRvcnk0MDYyMDcxOA==","name":"dm_dev_guide","full_name":"lsst-dm/dm_dev_guide","private":false,"owner":{"login":"lsst-dm","id":10968870,"node_id":"MDEyOk9yZ2FuaXphdGlvbjEwOTY4ODcw","avatar_url":"https://avatars1.githubusercontent.com/u/10968870?v=4","gravatar_id":"","url":"https://api.github.com/users/lsst-dm","html_url":"https://github.com/lsst-dm","followers_url":"https://api.github.com/users/lsst-dm/followers","following_url":"https://api.github.com/users/lsst-dm/following{/other_user}","gists_url":"https://api.github.com/users/lsst-dm/gists{/gist_id}","starred_url":"https://api.github.com/users/lsst-dm/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lsst-dm/subscriptions","organizations_url":"https://api.github.com/users/lsst-dm/orgs","repos_url":"https://api.github.com/users/lsst-dm/repos","events_url":"https://api.github.com/users/lsst-dm/events{/privacy}","received_events_url":"https://api.github.com/users/lsst-dm/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/lsst-dm/dm_dev_guide","description":"LSST Data Management Developer Guide","fork":false,"url":"https://api.github.com/repos/lsst-dm/dm_dev_guide","forks_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/forks","keys_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/keys{/key_id}","collaborators_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/teams","hooks_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/hooks","issue_events_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/issues/events{/number}","events_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/events","assignees_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/assignees{/user}","branches_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/branches{/branch}","tags_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/tags","blobs_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/git/refs{/sha}","trees_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/git/trees{/sha}","statuses_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/statuses/{sha}","languages_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/languages","stargazers_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/stargazers","contributors_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/contributors","subscribers_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/subscribers","subscription_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/subscription","commits_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/commits{/sha}","git_commits_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/git/commits{/sha}","comments_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/comments{/number}","issue_comment_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/issues/comments{/number}","contents_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/contents/{+path}","compare_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/compare/{base}...{head}","merges_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/merges","archive_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/downloads","issues_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/issues{/number}","pulls_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/pulls{/number}","milestones_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/milestones{/number}","notifications_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/labels{/name}","releases_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/releases{/id}","deployments_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/deployments","created_at":"2015-08-12T19:43:19Z","updated_at":"2018-10-01T13:04:24Z","pushed_at":"2018-10-01T22:28:07Z","git_url":"git://github.com/lsst-dm/dm_dev_guide.git","ssh_url":"git@github.com:lsst-dm/dm_dev_guide.git","clone_url":"https://github.com/lsst-dm/dm_dev_guide.git","svn_url":"https://github.com/lsst-dm/dm_dev_guide","homepage":"https://developer.lsst.io","size":8543,"stargazers_count":5,"watchers_count":5,"language":"Python","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":7,"mirror_url":null,"archived":false,"open_issues_count":5,"license":{"key":"cc-by-4.0","name":"Creative Commons Attribution 4.0 International","spdx_id":"CC-BY-4.0","url":"https://api.github.com/licenses/cc-by-4.0","node_id":"MDc6TGljZW5zZTI1"},"forks":7,"open_issues":5,"watchers":5,"default_branch":"master"}},"base":{"label":"lsst-dm:master","ref":"master","sha":"fb9c1a5ff430b3272de23353278d413e90240d67","user":{"login":"lsst-dm","id":10968870,"node_id":"MDEyOk9yZ2FuaXphdGlvbjEwOTY4ODcw","avatar_url":"https://avatars1.githubusercontent.com/u/10968870?v=4","gravatar_id":"","url":"https://api.github.com/users/lsst-dm","html_url":"https://github.com/lsst-dm","followers_url":"https://api.github.com/users/lsst-dm/followers","following_url":"https://api.github.com/users/lsst-dm/following{/other_user}","gists_url":"https://api.github.com/users/lsst-dm/gists{/gist_id}","starred_url":"https://api.github.com/users/lsst-dm/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lsst-dm/subscriptions","organizations_url":"https://api.github.com/users/lsst-dm/orgs","repos_url":"https://api.github.com/users/lsst-dm/repos","events_url":"https://api.github.com/users/lsst-dm/events{/privacy}","received_events_url":"https://api.github.com/users/lsst-dm/received_events","type":"Organization","site_admin":false},"repo":{"id":40620718,"node_id":"MDEwOlJlcG9zaXRvcnk0MDYyMDcxOA==","name":"dm_dev_guide","full_name":"lsst-dm/dm_dev_guide","private":false,"owner":{"login":"lsst-dm","id":10968870,"node_id":"MDEyOk9yZ2FuaXphdGlvbjEwOTY4ODcw","avatar_url":"https://avatars1.githubusercontent.com/u/10968870?v=4","gravatar_id":"","url":"https://api.github.com/users/lsst-dm","html_url":"https://github.com/lsst-dm","followers_url":"https://api.github.com/users/lsst-dm/followers","following_url":"https://api.github.com/users/lsst-dm/following{/other_user}","gists_url":"https://api.github.com/users/lsst-dm/gists{/gist_id}","starred_url":"https://api.github.com/users/lsst-dm/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lsst-dm/subscriptions","organizations_url":"https://api.github.com/users/lsst-dm/orgs","repos_url":"https://api.github.com/users/lsst-dm/repos","events_url":"https://api.github.com/users/lsst-dm/events{/privacy}","received_events_url":"https://api.github.com/users/lsst-dm/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/lsst-dm/dm_dev_guide","description":"LSST Data Management Developer Guide","fork":false,"url":"https://api.github.com/repos/lsst-dm/dm_dev_guide","forks_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/forks","keys_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/keys{/key_id}","collaborators_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/teams","hooks_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/hooks","issue_events_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/issues/events{/number}","events_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/events","assignees_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/assignees{/user}","branches_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/branches{/branch}","tags_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/tags","blobs_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/git/refs{/sha}","trees_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/git/trees{/sha}","statuses_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/statuses/{sha}","languages_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/languages","stargazers_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/stargazers","contributors_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/contributors","subscribers_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/subscribers","subscription_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/subscription","commits_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/commits{/sha}","git_commits_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/git/commits{/sha}","comments_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/comments{/number}","issue_comment_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/issues/comments{/number}","contents_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/contents/{+path}","compare_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/compare/{base}...{head}","merges_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/merges","archive_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/downloads","issues_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/issues{/number}","pulls_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/pulls{/number}","milestones_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/milestones{/number}","notifications_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/labels{/name}","releases_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/releases{/id}","deployments_url":"https://api.github.com/repos/lsst-dm/dm_dev_guide/deployments","created_at":"2015-08-12T19:43:19Z","updated_at":"2018-10-01T13:04:24Z","pushed_at":"2018-10-01T22:28:07Z","git_url":"git://github.com/lsst-dm/dm_dev_guide.git","ssh_url":"git@github.com:lsst-dm/dm_dev_guide.git","clone_url":"https://github.com/lsst-dm/dm_dev_guide.git","svn_url":"https://github.com/lsst-dm/dm_dev_guide","homepage":"https://developer.lsst.io","size":8543,"stargazers_count":5,"watchers_count":5,"language":"Python","has_issues":true,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":7,"mirror_url":null,"archived":false,"open_issues_count":5,"license":{"key":"cc-by-4.0","name":"Creative Commons Attribution 4.0 International","spdx_id":"CC-BY-4.0","url":"https://api.github.com/licenses/cc-by-4.0","node_id":"MDc6TGljZW5zZTI1"},"forks":7,"open_issues":5,"watchers":5,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/lsst-dm/dm_dev_guide/pulls/267"},"html":{"href":"https://github.com/lsst-dm/dm_dev_guide/pull/267"},"issue":{"href":"https://api.github.com/repos/lsst-dm/dm_dev_guide/issues/267"},"comments":{"href":"https://api.github.com/repos/lsst-dm/dm_dev_guide/issues/267/comments"},"review_comments":{"href":"https://api.github.com/repos/lsst-dm/dm_dev_guide/pulls/267/comments"},"review_comment":{"href":"https://api.github.com/repos/lsst-dm/dm_dev_guide/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/lsst-dm/dm_dev_guide/pulls/267/commits"},"statuses":{"href":"https://api.github.com/repos/lsst-dm/dm_dev_guide/statuses/5b3e9724883f0ed4e8ad0bc2d659a0521c733b86"}},"author_association":"NONE"}}
{"actor":{"display_login":"jonathansick"}}