{"action":"created","issue":{"url":"https://api.github.com/repos/sncosmo/sncosmo/issues/63","labels_url":"https://api.github.com/repos/sncosmo/sncosmo/issues/63/labels{/name}","comments_url":"https://api.github.com/repos/sncosmo/sncosmo/issues/63/comments","events_url":"https://api.github.com/repos/sncosmo/sncosmo/issues/63/events","html_url":"https://github.com/sncosmo/sncosmo/pull/63","id":54894346,"number":63,"title":"Adding new CC and PopIII SN models to sources.py","user":{"login":"srodney","id":1355473,"avatar_url":"https://avatars.githubusercontent.com/u/1355473?v=3","gravatar_id":"","url":"https://api.github.com/users/srodney","html_url":"https://github.com/srodney","followers_url":"https://api.github.com/users/srodney/followers","following_url":"https://api.github.com/users/srodney/following{/other_user}","gists_url":"https://api.github.com/users/srodney/gists{/gist_id}","starred_url":"https://api.github.com/users/srodney/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/srodney/subscriptions","organizations_url":"https://api.github.com/users/srodney/orgs","repos_url":"https://api.github.com/users/srodney/repos","events_url":"https://api.github.com/users/srodney/events{/privacy}","received_events_url":"https://api.github.com/users/srodney/received_events","type":"User","site_admin":false},"labels":[],"state":"closed","locked":false,"assignee":null,"milestone":null,"comments":3,"created_at":"2015-01-20T15:13:01Z","updated_at":"2015-01-20T17:22:57Z","closed_at":"2015-01-20T16:23:52Z","pull_request":{"url":"https://api.github.com/repos/sncosmo/sncosmo/pulls/63","html_url":"https://github.com/sncosmo/sncosmo/pull/63","diff_url":"https://github.com/sncosmo/sncosmo/pull/63.diff","patch_url":"https://github.com/sncosmo/sncosmo/pull/63.patch"},"body":"I tried to bring this in with a cleaner commit history by using `git rebase` instead of `git merge` ... but I'm not sure that I succeeded.   If this PR would result in duplications of previous commits, then let me know, and I'll rewind and rewrite history to clean it up. \r\n\r\n"},"comment":{"url":"https://api.github.com/repos/sncosmo/sncosmo/issues/comments/70694211","html_url":"https://github.com/sncosmo/sncosmo/pull/63#issuecomment-70694211","issue_url":"https://api.github.com/repos/sncosmo/sncosmo/issues/63","id":70694211,"user":{"login":"kbarbary","id":970135,"avatar_url":"https://avatars.githubusercontent.com/u/970135?v=3","gravatar_id":"","url":"https://api.github.com/users/kbarbary","html_url":"https://github.com/kbarbary","followers_url":"https://api.github.com/users/kbarbary/followers","following_url":"https://api.github.com/users/kbarbary/following{/other_user}","gists_url":"https://api.github.com/users/kbarbary/gists{/gist_id}","starred_url":"https://api.github.com/users/kbarbary/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kbarbary/subscriptions","organizations_url":"https://api.github.com/users/kbarbary/orgs","repos_url":"https://api.github.com/users/kbarbary/repos","events_url":"https://api.github.com/users/kbarbary/events{/privacy}","received_events_url":"https://api.github.com/users/kbarbary/received_events","type":"User","site_admin":false},"created_at":"2015-01-20T17:22:57Z","updated_at":"2015-01-20T17:22:57Z","body":"For the record, I would have expected rebase to get rid of the first 4 commits here, since they were already merged into master. Are you sure you `git fetch upstream`'d before rebasing? My other thought is that there might have been a problem with how you resolved conflicts. But not sure what that would be."}}