{"action":"created","comment":{"url":"https://api.github.com/repos/matthew-brett/gitwash/pulls/comments/173238852","pull_request_review_id":102395839,"id":173238852,"diff_hunk":"@@ -172,80 +172,27 @@ When you are ready to ask for someone to review your code and consider a merge:\n    pull request message.  This is still a good way of getting some preliminary\n    code review.\n \n-Some other things you might want to do\n-======================================\n-\n-Delete a branch on github\n--------------------------\n-\n-::\n-\n-   git checkout master\n-   # delete branch locally\n-   git branch -D my-unwanted-branch\n-   # delete branch on github\n-   git push origin :my-unwanted-branch\n-\n-Note the colon ``:`` before ``my-unwanted-branch``.  See also:\n-https://help.github.com/articles/pushing-to-a-remote/#deleting-a-remote-branch-or-tag\n-\n-Several people sharing a single repository\n-------------------------------------------\n-\n-If you want to work on some stuff with other people, where you are all\n-committing into the same repository, or even the same branch, then just\n-share it via github.\n-\n-First fork PROJECTNAME into your account, as from :ref:`forking`.\n-\n-Then, go to your forked repository github page, say\n-``https://github.com/your-user-name/REPONAME``\n-\n-Click on the 'Admin' button, and add anyone else to the repo as a\n-collaborator:\n-\n-   .. image:: pull_button.png\n-\n-Now all those people can do::\n-\n-    git clone git@githhub.com:your-user-name/REPONAME.git\n-\n-Remember that links starting with ``git@`` use the ssh protocol and are\n-read-write; links starting with ``git://`` are read-only.\n-\n-Your collaborators can then commit directly into that repo with the\n-usual::\n-\n-     git commit -am 'ENH - much better code'\n-     git push origin master # pushes directly into your repo\n-\n-Explore your repository\n------------------------\n-\n-To see a graphical representation of the repository branches and\n-commits::\n-\n-   gitk --all\n-\n-To see a linear list of commits for this branch::\n+.. _rebase-on-trunk:\n \n-   git log\n \n-You can also look at the `network graph visualizer`_ for your github\n-repo.\n+Rebasing a Pull Request (PR)\n+============================\n \n-Finally the :ref:`fancy-log` ``lg`` alias will give you a reasonable text-based\n-graph of the repository.\n+When working on a PR, changes may occur in the parent branch (usually master).\n+This can lead to conflict with changes in your branch. The conflicts can be\n+trivial: for example both the parent branch and your branch add an entry to\n+the top of `CHANGELOG`.  Git can not unambiguously tell what to do with both\n+changes (should one go above the other? if so, which order? should it try to\n+merge them?) so it declares the branches can not be merged\n+cleanly. GitHub can only automatically merge PR without conflicts, so you will","path":"gitwash/development_workflow.rst","position":86,"original_position":86,"commit_id":"46a0789aefeab40d15f5015d97f5eb72ad409f1a","original_commit_id":"46a0789aefeab40d15f5015d97f5eb72ad409f1a","user":{"login":"matthew-brett","id":67612,"avatar_url":"https://avatars2.githubusercontent.com/u/67612?v=4","gravatar_id":"","url":"https://api.github.com/users/matthew-brett","html_url":"https://github.com/matthew-brett","followers_url":"https://api.github.com/users/matthew-brett/followers","following_url":"https://api.github.com/users/matthew-brett/following{/other_user}","gists_url":"https://api.github.com/users/matthew-brett/gists{/gist_id}","starred_url":"https://api.github.com/users/matthew-brett/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/matthew-brett/subscriptions","organizations_url":"https://api.github.com/users/matthew-brett/orgs","repos_url":"https://api.github.com/users/matthew-brett/repos","events_url":"https://api.github.com/users/matthew-brett/events{/privacy}","received_events_url":"https://api.github.com/users/matthew-brett/received_events","type":"User","site_admin":false},"body":"merge a PR without conflicts\r\n\r\nYou can also merge of course.   And you might want to rebase if you haven't got conflicts.   I think you should separate the ideas of rebase and resolving code conflicts.","created_at":"2018-03-08T17:55:49Z","updated_at":"2018-03-08T18:03:51Z","html_url":"https://github.com/matthew-brett/gitwash/pull/13#discussion_r173238852","pull_request_url":"https://api.github.com/repos/matthew-brett/gitwash/pulls/13","author_association":"OWNER","_links":{"self":{"href":"https://api.github.com/repos/matthew-brett/gitwash/pulls/comments/173238852"},"html":{"href":"https://github.com/matthew-brett/gitwash/pull/13#discussion_r173238852"},"pull_request":{"href":"https://api.github.com/repos/matthew-brett/gitwash/pulls/13"}}},"pull_request":{"url":"https://api.github.com/repos/matthew-brett/gitwash/pulls/13","id":136653886,"html_url":"https://github.com/matthew-brett/gitwash/pull/13","diff_url":"https://github.com/matthew-brett/gitwash/pull/13.diff","patch_url":"https://github.com/matthew-brett/gitwash/pull/13.patch","issue_url":"https://api.github.com/repos/matthew-brett/gitwash/issues/13","number":13,"state":"open","locked":false,"title":"DOC: expand rebase docs","user":{"login":"tacaswell","id":199813,"avatar_url":"https://avatars3.githubusercontent.com/u/199813?v=4","gravatar_id":"","url":"https://api.github.com/users/tacaswell","html_url":"https://github.com/tacaswell","followers_url":"https://api.github.com/users/tacaswell/followers","following_url":"https://api.github.com/users/tacaswell/following{/other_user}","gists_url":"https://api.github.com/users/tacaswell/gists{/gist_id}","starred_url":"https://api.github.com/users/tacaswell/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tacaswell/subscriptions","organizations_url":"https://api.github.com/users/tacaswell/orgs","repos_url":"https://api.github.com/users/tacaswell/repos","events_url":"https://api.github.com/users/tacaswell/events{/privacy}","received_events_url":"https://api.github.com/users/tacaswell/received_events","type":"User","site_admin":false},"body":"Document with a real-world example.  Adapted from Matplotlib docs.","created_at":"2017-08-20T18:49:25Z","updated_at":"2018-03-08T18:03:51Z","closed_at":null,"merged_at":null,"merge_commit_sha":"fa17adb23622e7f9cb116eebde33aa28aca26e7c","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/matthew-brett/gitwash/pulls/13/commits","review_comments_url":"https://api.github.com/repos/matthew-brett/gitwash/pulls/13/comments","review_comment_url":"https://api.github.com/repos/matthew-brett/gitwash/pulls/comments{/number}","comments_url":"https://api.github.com/repos/matthew-brett/gitwash/issues/13/comments","statuses_url":"https://api.github.com/repos/matthew-brett/gitwash/statuses/46a0789aefeab40d15f5015d97f5eb72ad409f1a","head":{"label":"tacaswell:doc_rebase","ref":"doc_rebase","sha":"46a0789aefeab40d15f5015d97f5eb72ad409f1a","user":{"login":"tacaswell","id":199813,"avatar_url":"https://avatars3.githubusercontent.com/u/199813?v=4","gravatar_id":"","url":"https://api.github.com/users/tacaswell","html_url":"https://github.com/tacaswell","followers_url":"https://api.github.com/users/tacaswell/followers","following_url":"https://api.github.com/users/tacaswell/following{/other_user}","gists_url":"https://api.github.com/users/tacaswell/gists{/gist_id}","starred_url":"https://api.github.com/users/tacaswell/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tacaswell/subscriptions","organizations_url":"https://api.github.com/users/tacaswell/orgs","repos_url":"https://api.github.com/users/tacaswell/repos","events_url":"https://api.github.com/users/tacaswell/events{/privacy}","received_events_url":"https://api.github.com/users/tacaswell/received_events","type":"User","site_admin":false},"repo":{"id":100879986,"name":"gitwash","full_name":"tacaswell/gitwash","owner":{"login":"tacaswell","id":199813,"avatar_url":"https://avatars3.githubusercontent.com/u/199813?v=4","gravatar_id":"","url":"https://api.github.com/users/tacaswell","html_url":"https://github.com/tacaswell","followers_url":"https://api.github.com/users/tacaswell/followers","following_url":"https://api.github.com/users/tacaswell/following{/other_user}","gists_url":"https://api.github.com/users/tacaswell/gists{/gist_id}","starred_url":"https://api.github.com/users/tacaswell/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tacaswell/subscriptions","organizations_url":"https://api.github.com/users/tacaswell/orgs","repos_url":"https://api.github.com/users/tacaswell/repos","events_url":"https://api.github.com/users/tacaswell/events{/privacy}","received_events_url":"https://api.github.com/users/tacaswell/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/tacaswell/gitwash","description":"Workflow using git","fork":true,"url":"https://api.github.com/repos/tacaswell/gitwash","forks_url":"https://api.github.com/repos/tacaswell/gitwash/forks","keys_url":"https://api.github.com/repos/tacaswell/gitwash/keys{/key_id}","collaborators_url":"https://api.github.com/repos/tacaswell/gitwash/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/tacaswell/gitwash/teams","hooks_url":"https://api.github.com/repos/tacaswell/gitwash/hooks","issue_events_url":"https://api.github.com/repos/tacaswell/gitwash/issues/events{/number}","events_url":"https://api.github.com/repos/tacaswell/gitwash/events","assignees_url":"https://api.github.com/repos/tacaswell/gitwash/assignees{/user}","branches_url":"https://api.github.com/repos/tacaswell/gitwash/branches{/branch}","tags_url":"https://api.github.com/repos/tacaswell/gitwash/tags","blobs_url":"https://api.github.com/repos/tacaswell/gitwash/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/tacaswell/gitwash/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/tacaswell/gitwash/git/refs{/sha}","trees_url":"https://api.github.com/repos/tacaswell/gitwash/git/trees{/sha}","statuses_url":"https://api.github.com/repos/tacaswell/gitwash/statuses/{sha}","languages_url":"https://api.github.com/repos/tacaswell/gitwash/languages","stargazers_url":"https://api.github.com/repos/tacaswell/gitwash/stargazers","contributors_url":"https://api.github.com/repos/tacaswell/gitwash/contributors","subscribers_url":"https://api.github.com/repos/tacaswell/gitwash/subscribers","subscription_url":"https://api.github.com/repos/tacaswell/gitwash/subscription","commits_url":"https://api.github.com/repos/tacaswell/gitwash/commits{/sha}","git_commits_url":"https://api.github.com/repos/tacaswell/gitwash/git/commits{/sha}","comments_url":"https://api.github.com/repos/tacaswell/gitwash/comments{/number}","issue_comment_url":"https://api.github.com/repos/tacaswell/gitwash/issues/comments{/number}","contents_url":"https://api.github.com/repos/tacaswell/gitwash/contents/{+path}","compare_url":"https://api.github.com/repos/tacaswell/gitwash/compare/{base}...{head}","merges_url":"https://api.github.com/repos/tacaswell/gitwash/merges","archive_url":"https://api.github.com/repos/tacaswell/gitwash/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/tacaswell/gitwash/downloads","issues_url":"https://api.github.com/repos/tacaswell/gitwash/issues{/number}","pulls_url":"https://api.github.com/repos/tacaswell/gitwash/pulls{/number}","milestones_url":"https://api.github.com/repos/tacaswell/gitwash/milestones{/number}","notifications_url":"https://api.github.com/repos/tacaswell/gitwash/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/tacaswell/gitwash/labels{/name}","releases_url":"https://api.github.com/repos/tacaswell/gitwash/releases{/id}","deployments_url":"https://api.github.com/repos/tacaswell/gitwash/deployments","created_at":"2017-08-20T18:10:56Z","updated_at":"2017-08-20T18:10:58Z","pushed_at":"2017-08-20T21:22:10Z","git_url":"git://github.com/tacaswell/gitwash.git","ssh_url":"git@github.com:tacaswell/gitwash.git","clone_url":"https://github.com/tacaswell/gitwash.git","svn_url":"https://github.com/tacaswell/gitwash","homepage":"","size":234,"stargazers_count":0,"watchers_count":0,"language":"Python","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":null,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"matthew-brett:master","ref":"master","sha":"a764da5fd34f9c471abe7c17396889b2788671f9","user":{"login":"matthew-brett","id":67612,"avatar_url":"https://avatars2.githubusercontent.com/u/67612?v=4","gravatar_id":"","url":"https://api.github.com/users/matthew-brett","html_url":"https://github.com/matthew-brett","followers_url":"https://api.github.com/users/matthew-brett/followers","following_url":"https://api.github.com/users/matthew-brett/following{/other_user}","gists_url":"https://api.github.com/users/matthew-brett/gists{/gist_id}","starred_url":"https://api.github.com/users/matthew-brett/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/matthew-brett/subscriptions","organizations_url":"https://api.github.com/users/matthew-brett/orgs","repos_url":"https://api.github.com/users/matthew-brett/repos","events_url":"https://api.github.com/users/matthew-brett/events{/privacy}","received_events_url":"https://api.github.com/users/matthew-brett/received_events","type":"User","site_admin":false},"repo":{"id":627033,"name":"gitwash","full_name":"matthew-brett/gitwash","owner":{"login":"matthew-brett","id":67612,"avatar_url":"https://avatars2.githubusercontent.com/u/67612?v=4","gravatar_id":"","url":"https://api.github.com/users/matthew-brett","html_url":"https://github.com/matthew-brett","followers_url":"https://api.github.com/users/matthew-brett/followers","following_url":"https://api.github.com/users/matthew-brett/following{/other_user}","gists_url":"https://api.github.com/users/matthew-brett/gists{/gist_id}","starred_url":"https://api.github.com/users/matthew-brett/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/matthew-brett/subscriptions","organizations_url":"https://api.github.com/users/matthew-brett/orgs","repos_url":"https://api.github.com/users/matthew-brett/repos","events_url":"https://api.github.com/users/matthew-brett/events{/privacy}","received_events_url":"https://api.github.com/users/matthew-brett/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/matthew-brett/gitwash","description":"Workflow using git","fork":false,"url":"https://api.github.com/repos/matthew-brett/gitwash","forks_url":"https://api.github.com/repos/matthew-brett/gitwash/forks","keys_url":"https://api.github.com/repos/matthew-brett/gitwash/keys{/key_id}","collaborators_url":"https://api.github.com/repos/matthew-brett/gitwash/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/matthew-brett/gitwash/teams","hooks_url":"https://api.github.com/repos/matthew-brett/gitwash/hooks","issue_events_url":"https://api.github.com/repos/matthew-brett/gitwash/issues/events{/number}","events_url":"https://api.github.com/repos/matthew-brett/gitwash/events","assignees_url":"https://api.github.com/repos/matthew-brett/gitwash/assignees{/user}","branches_url":"https://api.github.com/repos/matthew-brett/gitwash/branches{/branch}","tags_url":"https://api.github.com/repos/matthew-brett/gitwash/tags","blobs_url":"https://api.github.com/repos/matthew-brett/gitwash/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/matthew-brett/gitwash/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/matthew-brett/gitwash/git/refs{/sha}","trees_url":"https://api.github.com/repos/matthew-brett/gitwash/git/trees{/sha}","statuses_url":"https://api.github.com/repos/matthew-brett/gitwash/statuses/{sha}","languages_url":"https://api.github.com/repos/matthew-brett/gitwash/languages","stargazers_url":"https://api.github.com/repos/matthew-brett/gitwash/stargazers","contributors_url":"https://api.github.com/repos/matthew-brett/gitwash/contributors","subscribers_url":"https://api.github.com/repos/matthew-brett/gitwash/subscribers","subscription_url":"https://api.github.com/repos/matthew-brett/gitwash/subscription","commits_url":"https://api.github.com/repos/matthew-brett/gitwash/commits{/sha}","git_commits_url":"https://api.github.com/repos/matthew-brett/gitwash/git/commits{/sha}","comments_url":"https://api.github.com/repos/matthew-brett/gitwash/comments{/number}","issue_comment_url":"https://api.github.com/repos/matthew-brett/gitwash/issues/comments{/number}","contents_url":"https://api.github.com/repos/matthew-brett/gitwash/contents/{+path}","compare_url":"https://api.github.com/repos/matthew-brett/gitwash/compare/{base}...{head}","merges_url":"https://api.github.com/repos/matthew-brett/gitwash/merges","archive_url":"https://api.github.com/repos/matthew-brett/gitwash/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/matthew-brett/gitwash/downloads","issues_url":"https://api.github.com/repos/matthew-brett/gitwash/issues{/number}","pulls_url":"https://api.github.com/repos/matthew-brett/gitwash/pulls{/number}","milestones_url":"https://api.github.com/repos/matthew-brett/gitwash/milestones{/number}","notifications_url":"https://api.github.com/repos/matthew-brett/gitwash/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/matthew-brett/gitwash/labels{/name}","releases_url":"https://api.github.com/repos/matthew-brett/gitwash/releases{/id}","deployments_url":"https://api.github.com/repos/matthew-brett/gitwash/deployments","created_at":"2010-04-24T17:52:12Z","updated_at":"2018-02-07T02:40:22Z","pushed_at":"2017-09-11T21:18:35Z","git_url":"git://github.com/matthew-brett/gitwash.git","ssh_url":"git@github.com:matthew-brett/gitwash.git","clone_url":"https://github.com/matthew-brett/gitwash.git","svn_url":"https://github.com/matthew-brett/gitwash","homepage":"","size":230,"stargazers_count":37,"watchers_count":37,"language":"Python","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":19,"mirror_url":null,"archived":false,"open_issues_count":4,"license":{"key":"other","name":"Other","spdx_id":null,"url":null},"forks":19,"open_issues":4,"watchers":37,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/matthew-brett/gitwash/pulls/13"},"html":{"href":"https://github.com/matthew-brett/gitwash/pull/13"},"issue":{"href":"https://api.github.com/repos/matthew-brett/gitwash/issues/13"},"comments":{"href":"https://api.github.com/repos/matthew-brett/gitwash/issues/13/comments"},"review_comments":{"href":"https://api.github.com/repos/matthew-brett/gitwash/pulls/13/comments"},"review_comment":{"href":"https://api.github.com/repos/matthew-brett/gitwash/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/matthew-brett/gitwash/pulls/13/commits"},"statuses":{"href":"https://api.github.com/repos/matthew-brett/gitwash/statuses/46a0789aefeab40d15f5015d97f5eb72ad409f1a"}},"author_association":"NONE"}}
{"actor":{"display_login":"matthew-brett"}}