{"action":"created","issue":{"url":"https://api.github.com/repos/MDAnalysis/mdanalysis/issues/779","repository_url":"https://api.github.com/repos/MDAnalysis/mdanalysis","labels_url":"https://api.github.com/repos/MDAnalysis/mdanalysis/issues/779/labels{/name}","comments_url":"https://api.github.com/repos/MDAnalysis/mdanalysis/issues/779/comments","events_url":"https://api.github.com/repos/MDAnalysis/mdanalysis/issues/779/events","html_url":"https://github.com/MDAnalysis/mdanalysis/pull/779","id":141971113,"number":779,"title":"updated change_release to fix regex","user":{"login":"jdetle","id":10944582,"avatar_url":"https://avatars.githubusercontent.com/u/10944582?v=3","gravatar_id":"","url":"https://api.github.com/users/jdetle","html_url":"https://github.com/jdetle","followers_url":"https://api.github.com/users/jdetle/followers","following_url":"https://api.github.com/users/jdetle/following{/other_user}","gists_url":"https://api.github.com/users/jdetle/gists{/gist_id}","starred_url":"https://api.github.com/users/jdetle/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jdetle/subscriptions","organizations_url":"https://api.github.com/users/jdetle/orgs","repos_url":"https://api.github.com/users/jdetle/repos","events_url":"https://api.github.com/users/jdetle/events{/privacy}","received_events_url":"https://api.github.com/users/jdetle/received_events","type":"User","site_admin":false},"labels":[{"url":"https://api.github.com/repos/MDAnalysis/mdanalysis/labels/Component-Scripts","name":"Component-Scripts","color":"bfd4f2"}],"state":"open","locked":false,"assignee":{"login":"orbeckst","id":237980,"avatar_url":"https://avatars.githubusercontent.com/u/237980?v=3","gravatar_id":"","url":"https://api.github.com/users/orbeckst","html_url":"https://github.com/orbeckst","followers_url":"https://api.github.com/users/orbeckst/followers","following_url":"https://api.github.com/users/orbeckst/following{/other_user}","gists_url":"https://api.github.com/users/orbeckst/gists{/gist_id}","starred_url":"https://api.github.com/users/orbeckst/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/orbeckst/subscriptions","organizations_url":"https://api.github.com/users/orbeckst/orgs","repos_url":"https://api.github.com/users/orbeckst/repos","events_url":"https://api.github.com/users/orbeckst/events{/privacy}","received_events_url":"https://api.github.com/users/orbeckst/received_events","type":"User","site_admin":false},"milestone":{"url":"https://api.github.com/repos/MDAnalysis/mdanalysis/milestones/8","html_url":"https://github.com/MDAnalysis/mdanalysis/milestones/0.15.0","labels_url":"https://api.github.com/repos/MDAnalysis/mdanalysis/milestones/8/labels","id":1591417,"number":8,"title":"0.15.0","description":"Bugfixes and deprecation warning additions for 0.14 release.","creator":{"login":"dotsdl","id":1326811,"avatar_url":"https://avatars.githubusercontent.com/u/1326811?v=3","gravatar_id":"","url":"https://api.github.com/users/dotsdl","html_url":"https://github.com/dotsdl","followers_url":"https://api.github.com/users/dotsdl/followers","following_url":"https://api.github.com/users/dotsdl/following{/other_user}","gists_url":"https://api.github.com/users/dotsdl/gists{/gist_id}","starred_url":"https://api.github.com/users/dotsdl/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dotsdl/subscriptions","organizations_url":"https://api.github.com/users/dotsdl/orgs","repos_url":"https://api.github.com/users/dotsdl/repos","events_url":"https://api.github.com/users/dotsdl/events{/privacy}","received_events_url":"https://api.github.com/users/dotsdl/received_events","type":"User","site_admin":false},"open_issues":7,"closed_issues":13,"state":"open","created_at":"2016-02-18T19:21:16Z","updated_at":"2016-03-19T10:10:14Z","due_on":"2016-03-10T00:00:00Z","closed_at":null},"comments":23,"created_at":"2016-03-18T20:34:39Z","updated_at":"2016-03-19T18:21:56Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/MDAnalysis/mdanalysis/pulls/779","html_url":"https://github.com/MDAnalysis/mdanalysis/pull/779","diff_url":"https://github.com/MDAnalysis/mdanalysis/pull/779.diff","patch_url":"https://github.com/MDAnalysis/mdanalysis/pull/779.patch"},"body":"Changes made in this Pull Request:\r\n* ~~No additional tests added,~~ unsure if necessary. (see below – @orbeckst)\r\n* CHANGELOG updated to reflect fix.\r\n* Fixes #776  \r\n\r\nPR Checklist\r\n------------\r\n\r\n - [x] Tests (manual, attached to this PR)\r\n - [no ] Docs?\r\n - [x] CHANGELOG updated?\r\n - [x] Issue raised/referenced?\r\n"},"comment":{"url":"https://api.github.com/repos/MDAnalysis/mdanalysis/issues/comments/198761364","html_url":"https://github.com/MDAnalysis/mdanalysis/pull/779#issuecomment-198761364","issue_url":"https://api.github.com/repos/MDAnalysis/mdanalysis/issues/779","id":198761364,"user":{"login":"jbarnoud","id":1382074,"avatar_url":"https://avatars.githubusercontent.com/u/1382074?v=3","gravatar_id":"","url":"https://api.github.com/users/jbarnoud","html_url":"https://github.com/jbarnoud","followers_url":"https://api.github.com/users/jbarnoud/followers","following_url":"https://api.github.com/users/jbarnoud/following{/other_user}","gists_url":"https://api.github.com/users/jbarnoud/gists{/gist_id}","starred_url":"https://api.github.com/users/jbarnoud/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jbarnoud/subscriptions","organizations_url":"https://api.github.com/users/jbarnoud/orgs","repos_url":"https://api.github.com/users/jbarnoud/repos","events_url":"https://api.github.com/users/jbarnoud/events{/privacy}","received_events_url":"https://api.github.com/users/jbarnoud/received_events","type":"User","site_admin":false},"created_at":"2016-03-19T18:21:56Z","updated_at":"2016-03-19T18:21:56Z","body":"I am not sure of what goes wrong with your rebase. First of all, I would work on a copy of the branch:\r\n\r\n```bash\r\ngit checkout -b issue-776-change_release\r\n```\r\n\r\nThis should create a copy of your `develop` branch. Then I would update your develop branch to match the current status of MDAnalysis `develop` branch:\r\n\r\n```bash\r\n# Get easy access to the main MDAnalysis repo\r\n# This creates a `remote` named `upstream`\r\ngit remote add upstream git@github.com:MDAnalysis/mdanalysis.git\r\n\r\n# Get the up to date status of upstream\r\ngit fetch upstream develop\r\n```\r\n\r\nNow that you have a copy of the main MDAnalysis `develop` branch, you can rebase against it:\r\n\r\n```bash\r\ngit rebase -i upstream/develop\r\n```\r\n\r\nYou should get one commit of yours as the most recent commit. Push your `issue-776-change_release` branch and try to make a fake pull request (fake in the sense that you do not have to submit it). Inspect the diff to see if it looks as you want. If so you an replace your `develop` branch by your `issue-776-change_release` one:\r\n\r\n```bash\r\n# Delete your develop branch\r\ngit branch -D develop\r\n# Create a new develop branch that is a copy of issue-776-change_release\r\ngit checkout -b develop\r\n```\r\n\r\nMove to your new `develop` branch and make sure it looks as it should:\r\n\r\n```bash\r\ngit checkout develop\r\ngit status\r\ngit log\r\n```\r\n\r\nIf everything is fine, you can push the `develop` branch to github to update the PR. You will have to force the push, which can lead to data loss if anything goes wrong. So, at that point, you need to be sure your `develop` branch is how you want it to be.\r\n\r\n```bash\r\ngit push origin develop --force\r\n```\r\n\r\nHopefully everything is beautiful, and the PR is perfect.\r\n\r\nNext time, work directly in a separate branch, so you can keep your `develop` branch in sync with MDAnalysis one."}}