{"action":"created","issue":{"url":"https://api.github.com/repos/ds-ga-1007/assignment2/issues/9","labels_url":"https://api.github.com/repos/ds-ga-1007/assignment2/issues/9/labels{/name}","comments_url":"https://api.github.com/repos/ds-ga-1007/assignment2/issues/9/comments","events_url":"https://api.github.com/repos/ds-ga-1007/assignment2/issues/9/events","html_url":"https://github.com/ds-ga-1007/assignment2/pull/9","id":57875598,"number":9,"title":"assignment2/my1288","user":{"login":"mahayaqub","id":10950648,"avatar_url":"https://avatars.githubusercontent.com/u/10950648?v=3","gravatar_id":"","url":"https://api.github.com/users/mahayaqub","html_url":"https://github.com/mahayaqub","followers_url":"https://api.github.com/users/mahayaqub/followers","following_url":"https://api.github.com/users/mahayaqub/following{/other_user}","gists_url":"https://api.github.com/users/mahayaqub/gists{/gist_id}","starred_url":"https://api.github.com/users/mahayaqub/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mahayaqub/subscriptions","organizations_url":"https://api.github.com/users/mahayaqub/orgs","repos_url":"https://api.github.com/users/mahayaqub/repos","events_url":"https://api.github.com/users/mahayaqub/events{/privacy}","received_events_url":"https://api.github.com/users/mahayaqub/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":1,"created_at":"2015-02-17T02:20:29Z","updated_at":"2015-02-17T17:11:05Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/ds-ga-1007/assignment2/pulls/9","html_url":"https://github.com/ds-ga-1007/assignment2/pull/9","diff_url":"https://github.com/ds-ga-1007/assignment2/pull/9.diff","patch_url":"https://github.com/ds-ga-1007/assignment2/pull/9.patch"},"body":"The following are the commits for my file. My push command kept on giving errors so I not know if this is correct.\r\n\r\nPlease do let me know if it is. \r\n\r\nFor Question 13 I had the following conflict:\r\nThe following happens when the branches are merged after the same line is changed in the file for each branch:\r\n\r\n\r\nds-ga-1007$ git merge testing\r\nAuto-merging calendar.usholiday\r\nCONFLICT (content): Merge conflict in calendar.usholiday\r\nAutomatic merge failed; fix conflicts and then commit the result.\r\n\r\nRegards,\r\nMaha Yaqub\r\nmy1288@nyu.edu"},"comment":{"url":"https://api.github.com/repos/ds-ga-1007/assignment2/issues/comments/74706482","html_url":"https://github.com/ds-ga-1007/assignment2/pull/9#issuecomment-74706482","issue_url":"https://api.github.com/repos/ds-ga-1007/assignment2/issues/9","id":74706482,"user":{"login":"ds-ga-1007","id":8772035,"avatar_url":"https://avatars.githubusercontent.com/u/8772035?v=3","gravatar_id":"","url":"https://api.github.com/users/ds-ga-1007","html_url":"https://github.com/ds-ga-1007","followers_url":"https://api.github.com/users/ds-ga-1007/followers","following_url":"https://api.github.com/users/ds-ga-1007/following{/other_user}","gists_url":"https://api.github.com/users/ds-ga-1007/gists{/gist_id}","starred_url":"https://api.github.com/users/ds-ga-1007/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ds-ga-1007/subscriptions","organizations_url":"https://api.github.com/users/ds-ga-1007/orgs","repos_url":"https://api.github.com/users/ds-ga-1007/repos","events_url":"https://api.github.com/users/ds-ga-1007/events{/privacy}","received_events_url":"https://api.github.com/users/ds-ga-1007/received_events","type":"User","site_admin":false},"created_at":"2015-02-17T17:11:05Z","updated_at":"2015-02-17T17:11:05Z","body":"Please put the file in a folder named by your NetID and request again\r\n\r\n-S"}}