{"action":"created","issue":{"url":"https://api.github.com/repos/scottgs/swe-spring-2015/issues/30","labels_url":"https://api.github.com/repos/scottgs/swe-spring-2015/issues/30/labels{/name}","comments_url":"https://api.github.com/repos/scottgs/swe-spring-2015/issues/30/comments","events_url":"https://api.github.com/repos/scottgs/swe-spring-2015/issues/30/events","html_url":"https://github.com/scottgs/swe-spring-2015/pull/30","id":55988317,"number":30,"title":"added 2 more sentences","user":{"login":"esparhawk1","id":9057084,"avatar_url":"https://avatars.githubusercontent.com/u/9057084?v=3","gravatar_id":"","url":"https://api.github.com/users/esparhawk1","html_url":"https://github.com/esparhawk1","followers_url":"https://api.github.com/users/esparhawk1/followers","following_url":"https://api.github.com/users/esparhawk1/following{/other_user}","gists_url":"https://api.github.com/users/esparhawk1/gists{/gist_id}","starred_url":"https://api.github.com/users/esparhawk1/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/esparhawk1/subscriptions","organizations_url":"https://api.github.com/users/esparhawk1/orgs","repos_url":"https://api.github.com/users/esparhawk1/repos","events_url":"https://api.github.com/users/esparhawk1/events{/privacy}","received_events_url":"https://api.github.com/users/esparhawk1/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":1,"created_at":"2015-01-30T02:50:41Z","updated_at":"2015-01-30T03:13:24Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/scottgs/swe-spring-2015/pulls/30","html_url":"https://github.com/scottgs/swe-spring-2015/pull/30","diff_url":"https://github.com/scottgs/swe-spring-2015/pull/30.diff","patch_url":"https://github.com/scottgs/swe-spring-2015/pull/30.patch"},"body":"4 sentences total now, having issues getting my branch pushed in."},"comment":{"url":"https://api.github.com/repos/scottgs/swe-spring-2015/issues/comments/72147572","html_url":"https://github.com/scottgs/swe-spring-2015/pull/30#issuecomment-72147572","issue_url":"https://api.github.com/repos/scottgs/swe-spring-2015/issues/30","id":72147572,"user":{"login":"scottgs","id":6405402,"avatar_url":"https://avatars.githubusercontent.com/u/6405402?v=3","gravatar_id":"","url":"https://api.github.com/users/scottgs","html_url":"https://github.com/scottgs","followers_url":"https://api.github.com/users/scottgs/followers","following_url":"https://api.github.com/users/scottgs/following{/other_user}","gists_url":"https://api.github.com/users/scottgs/gists{/gist_id}","starred_url":"https://api.github.com/users/scottgs/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/scottgs/subscriptions","organizations_url":"https://api.github.com/users/scottgs/orgs","repos_url":"https://api.github.com/users/scottgs/repos","events_url":"https://api.github.com/users/scottgs/events{/privacy}","received_events_url":"https://api.github.com/users/scottgs/received_events","type":"User","site_admin":false},"created_at":"2015-01-30T03:13:24Z","updated_at":"2015-01-30T03:13:24Z","body":"# We can’t automatically merge this pull request.\r\n\r\nto resolve conflicts before continuing.\r\nCheckout via command line\r\n\r\nIf you cannot merge a pull request automatically here, you have the option of checking it out via command line to resolve conflicts and perform a manual merge.\r\nHTTPS Git Patch\r\n\r\nStep 1: From your project repository, bring in the changes and test.\r\n\r\ngit fetch origin\r\ngit checkout -b amd2b7 origin/amd2b7\r\ngit merge master\r\n\r\nStep 2: Merge the changes and update on GitHub.\r\n\r\ngit checkout master\r\ngit merge --no-ff amd2b7\r\ngit push origin master"}}