{"action":"created","issue":{"url":"https://api.github.com/repos/scp-fs2open/fs2open.github.com/issues/228","labels_url":"https://api.github.com/repos/scp-fs2open/fs2open.github.com/issues/228/labels{/name}","comments_url":"https://api.github.com/repos/scp-fs2open/fs2open.github.com/issues/228/comments","events_url":"https://api.github.com/repos/scp-fs2open/fs2open.github.com/issues/228/events","html_url":"https://github.com/scp-fs2open/fs2open.github.com/pull/228","id":92911608,"number":228,"title":"Sync Antipodes","user":{"login":"asarium","id":1013983,"avatar_url":"https://avatars.githubusercontent.com/u/1013983?v=3","gravatar_id":"","url":"https://api.github.com/users/asarium","html_url":"https://github.com/asarium","followers_url":"https://api.github.com/users/asarium/followers","following_url":"https://api.github.com/users/asarium/following{/other_user}","gists_url":"https://api.github.com/users/asarium/gists{/gist_id}","starred_url":"https://api.github.com/users/asarium/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/asarium/subscriptions","organizations_url":"https://api.github.com/users/asarium/orgs","repos_url":"https://api.github.com/users/asarium/repos","events_url":"https://api.github.com/users/asarium/events{/privacy}","received_events_url":"https://api.github.com/users/asarium/received_events","type":"User","site_admin":false},"labels":[{"url":"https://api.github.com/repos/scp-fs2open/fs2open.github.com/labels/antipodes","name":"antipodes","color":"0052cc"}],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":3,"created_at":"2015-07-03T17:17:20Z","updated_at":"2015-07-04T13:35:58Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/scp-fs2open/fs2open.github.com/pulls/228","html_url":"https://github.com/scp-fs2open/fs2open.github.com/pull/228","diff_url":"https://github.com/scp-fs2open/fs2open.github.com/pull/228.diff","patch_url":"https://github.com/scp-fs2open/fs2open.github.com/pull/228.patch"},"body":""},"comment":{"url":"https://api.github.com/repos/scp-fs2open/fs2open.github.com/issues/comments/118513085","html_url":"https://github.com/scp-fs2open/fs2open.github.com/pull/228#issuecomment-118513085","issue_url":"https://api.github.com/repos/scp-fs2open/fs2open.github.com/issues/228","id":118513085,"user":{"login":"chief1983","id":145825,"avatar_url":"https://avatars.githubusercontent.com/u/145825?v=3","gravatar_id":"","url":"https://api.github.com/users/chief1983","html_url":"https://github.com/chief1983","followers_url":"https://api.github.com/users/chief1983/followers","following_url":"https://api.github.com/users/chief1983/following{/other_user}","gists_url":"https://api.github.com/users/chief1983/gists{/gist_id}","starred_url":"https://api.github.com/users/chief1983/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/chief1983/subscriptions","organizations_url":"https://api.github.com/users/chief1983/orgs","repos_url":"https://api.github.com/users/chief1983/repos","events_url":"https://api.github.com/users/chief1983/events{/privacy}","received_events_url":"https://api.github.com/users/chief1983/received_events","type":"User","site_admin":false},"created_at":"2015-07-04T13:35:58Z","updated_at":"2015-07-04T13:35:58Z","body":"When I ran git merge master on antipodes I ended up with lots of conflicts, how did this end up smoother?  Also, echelon9, this appears to be a merge, not a rebase."}}