{"action":"created","comment":{"url":"https://api.github.com/repos/Ben987/Bondage-College/pulls/comments/143357777","pull_request_review_id":67860380,"id":143357777,"diff_hunk":"@@ -1,31 +1,5 @@\n-// A bank of all the chached images","path":"Drawing.js","position":1,"original_position":1,"commit_id":"0977e43bff250b6039678c7ebb4f4292f79da641","original_commit_id":"0977e43bff250b6039678c7ebb4f4292f79da641","user":{"login":"project-am","id":31292391,"avatar_url":"https://avatars2.githubusercontent.com/u/31292391?v=4","gravatar_id":"","url":"https://api.github.com/users/project-am","html_url":"https://github.com/project-am","followers_url":"https://api.github.com/users/project-am/followers","following_url":"https://api.github.com/users/project-am/following{/other_user}","gists_url":"https://api.github.com/users/project-am/gists{/gist_id}","starred_url":"https://api.github.com/users/project-am/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/project-am/subscriptions","organizations_url":"https://api.github.com/users/project-am/orgs","repos_url":"https://api.github.com/users/project-am/repos","events_url":"https://api.github.com/users/project-am/events{/privacy}","received_events_url":"https://api.github.com/users/project-am/received_events","type":"User","site_admin":false},"body":"You got it right. Usually, git should warn you about this kind of problem with a \"merge conflict\", which forces you to carefully choose between the different versions or combine them, which results in a new commit you have to push in order to resolve the conflict","created_at":"2017-10-08T15:32:33Z","updated_at":"2017-10-08T15:32:33Z","html_url":"https://github.com/Ben987/Bondage-College/pull/14#discussion_r143357777","pull_request_url":"https://api.github.com/repos/Ben987/Bondage-College/pulls/14","author_association":"CONTRIBUTOR","_links":{"self":{"href":"https://api.github.com/repos/Ben987/Bondage-College/pulls/comments/143357777"},"html":{"href":"https://github.com/Ben987/Bondage-College/pull/14#discussion_r143357777"},"pull_request":{"href":"https://api.github.com/repos/Ben987/Bondage-College/pulls/14"}},"in_reply_to_id":143329033},"pull_request":{"url":"https://api.github.com/repos/Ben987/Bondage-College/pulls/14","id":145262990,"html_url":"https://github.com/Ben987/Bondage-College/pull/14","diff_url":"https://github.com/Ben987/Bondage-College/pull/14.diff","patch_url":"https://github.com/Ben987/Bondage-College/pull/14.patch","issue_url":"https://api.github.com/repos/Ben987/Bondage-College/issues/14","number":14,"state":"closed","locked":false,"title":"LunchBreak with Natalie","user":{"login":"wildsj","id":32558920,"avatar_url":"https://avatars3.githubusercontent.com/u/32558920?v=4","gravatar_id":"","url":"https://api.github.com/users/wildsj","html_url":"https://github.com/wildsj","followers_url":"https://api.github.com/users/wildsj/followers","following_url":"https://api.github.com/users/wildsj/following{/other_user}","gists_url":"https://api.github.com/users/wildsj/gists{/gist_id}","starred_url":"https://api.github.com/users/wildsj/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wildsj/subscriptions","organizations_url":"https://api.github.com/users/wildsj/orgs","repos_url":"https://api.github.com/users/wildsj/repos","events_url":"https://api.github.com/users/wildsj/events{/privacy}","received_events_url":"https://api.github.com/users/wildsj/received_events","type":"User","site_admin":false},"body":"I think this has got all the files added to make Natalie work. I'm still getting my head around how GitHub works.","created_at":"2017-10-06T23:12:42Z","updated_at":"2017-10-08T15:32:33Z","closed_at":"2017-10-08T14:32:33Z","merged_at":"2017-10-08T14:32:33Z","merge_commit_sha":"6d9ce91d2108ef7ecc15b20fc533e88c83474fbd","assignee":null,"assignees":[],"requested_reviewers":[],"milestone":null,"commits_url":"https://api.github.com/repos/Ben987/Bondage-College/pulls/14/commits","review_comments_url":"https://api.github.com/repos/Ben987/Bondage-College/pulls/14/comments","review_comment_url":"https://api.github.com/repos/Ben987/Bondage-College/pulls/comments{/number}","comments_url":"https://api.github.com/repos/Ben987/Bondage-College/issues/14/comments","statuses_url":"https://api.github.com/repos/Ben987/Bondage-College/statuses/0977e43bff250b6039678c7ebb4f4292f79da641","head":{"label":"wildsj:master","ref":"master","sha":"0977e43bff250b6039678c7ebb4f4292f79da641","user":{"login":"wildsj","id":32558920,"avatar_url":"https://avatars3.githubusercontent.com/u/32558920?v=4","gravatar_id":"","url":"https://api.github.com/users/wildsj","html_url":"https://github.com/wildsj","followers_url":"https://api.github.com/users/wildsj/followers","following_url":"https://api.github.com/users/wildsj/following{/other_user}","gists_url":"https://api.github.com/users/wildsj/gists{/gist_id}","starred_url":"https://api.github.com/users/wildsj/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wildsj/subscriptions","organizations_url":"https://api.github.com/users/wildsj/orgs","repos_url":"https://api.github.com/users/wildsj/repos","events_url":"https://api.github.com/users/wildsj/events{/privacy}","received_events_url":"https://api.github.com/users/wildsj/received_events","type":"User","site_admin":false},"repo":{"id":106049701,"name":"Bondage-College-1","full_name":"wildsj/Bondage-College-1","owner":{"login":"wildsj","id":32558920,"avatar_url":"https://avatars3.githubusercontent.com/u/32558920?v=4","gravatar_id":"","url":"https://api.github.com/users/wildsj","html_url":"https://github.com/wildsj","followers_url":"https://api.github.com/users/wildsj/followers","following_url":"https://api.github.com/users/wildsj/following{/other_user}","gists_url":"https://api.github.com/users/wildsj/gists{/gist_id}","starred_url":"https://api.github.com/users/wildsj/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wildsj/subscriptions","organizations_url":"https://api.github.com/users/wildsj/orgs","repos_url":"https://api.github.com/users/wildsj/repos","events_url":"https://api.github.com/users/wildsj/events{/privacy}","received_events_url":"https://api.github.com/users/wildsj/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/wildsj/Bondage-College-1","description":"Bondage College Javascript/HTML5 game","fork":true,"url":"https://api.github.com/repos/wildsj/Bondage-College-1","forks_url":"https://api.github.com/repos/wildsj/Bondage-College-1/forks","keys_url":"https://api.github.com/repos/wildsj/Bondage-College-1/keys{/key_id}","collaborators_url":"https://api.github.com/repos/wildsj/Bondage-College-1/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/wildsj/Bondage-College-1/teams","hooks_url":"https://api.github.com/repos/wildsj/Bondage-College-1/hooks","issue_events_url":"https://api.github.com/repos/wildsj/Bondage-College-1/issues/events{/number}","events_url":"https://api.github.com/repos/wildsj/Bondage-College-1/events","assignees_url":"https://api.github.com/repos/wildsj/Bondage-College-1/assignees{/user}","branches_url":"https://api.github.com/repos/wildsj/Bondage-College-1/branches{/branch}","tags_url":"https://api.github.com/repos/wildsj/Bondage-College-1/tags","blobs_url":"https://api.github.com/repos/wildsj/Bondage-College-1/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/wildsj/Bondage-College-1/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/wildsj/Bondage-College-1/git/refs{/sha}","trees_url":"https://api.github.com/repos/wildsj/Bondage-College-1/git/trees{/sha}","statuses_url":"https://api.github.com/repos/wildsj/Bondage-College-1/statuses/{sha}","languages_url":"https://api.github.com/repos/wildsj/Bondage-College-1/languages","stargazers_url":"https://api.github.com/repos/wildsj/Bondage-College-1/stargazers","contributors_url":"https://api.github.com/repos/wildsj/Bondage-College-1/contributors","subscribers_url":"https://api.github.com/repos/wildsj/Bondage-College-1/subscribers","subscription_url":"https://api.github.com/repos/wildsj/Bondage-College-1/subscription","commits_url":"https://api.github.com/repos/wildsj/Bondage-College-1/commits{/sha}","git_commits_url":"https://api.github.com/repos/wildsj/Bondage-College-1/git/commits{/sha}","comments_url":"https://api.github.com/repos/wildsj/Bondage-College-1/comments{/number}","issue_comment_url":"https://api.github.com/repos/wildsj/Bondage-College-1/issues/comments{/number}","contents_url":"https://api.github.com/repos/wildsj/Bondage-College-1/contents/{+path}","compare_url":"https://api.github.com/repos/wildsj/Bondage-College-1/compare/{base}...{head}","merges_url":"https://api.github.com/repos/wildsj/Bondage-College-1/merges","archive_url":"https://api.github.com/repos/wildsj/Bondage-College-1/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/wildsj/Bondage-College-1/downloads","issues_url":"https://api.github.com/repos/wildsj/Bondage-College-1/issues{/number}","pulls_url":"https://api.github.com/repos/wildsj/Bondage-College-1/pulls{/number}","milestones_url":"https://api.github.com/repos/wildsj/Bondage-College-1/milestones{/number}","notifications_url":"https://api.github.com/repos/wildsj/Bondage-College-1/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/wildsj/Bondage-College-1/labels{/name}","releases_url":"https://api.github.com/repos/wildsj/Bondage-College-1/releases{/id}","deployments_url":"https://api.github.com/repos/wildsj/Bondage-College-1/deployments","created_at":"2017-10-06T20:57:51Z","updated_at":"2017-10-07T17:52:12Z","pushed_at":"2017-10-06T22:29:32Z","git_url":"git://github.com/wildsj/Bondage-College-1.git","ssh_url":"git@github.com:wildsj/Bondage-College-1.git","clone_url":"https://github.com/wildsj/Bondage-College-1.git","svn_url":"https://github.com/wildsj/Bondage-College-1","homepage":null,"size":68246,"stargazers_count":1,"watchers_count":1,"language":"JavaScript","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":1,"default_branch":"master"}},"base":{"label":"Ben987:master","ref":"master","sha":"4751a58ce52ae5c1233ae78d2aa281ddd2cb778d","user":{"login":"Ben987","id":30805159,"avatar_url":"https://avatars2.githubusercontent.com/u/30805159?v=4","gravatar_id":"","url":"https://api.github.com/users/Ben987","html_url":"https://github.com/Ben987","followers_url":"https://api.github.com/users/Ben987/followers","following_url":"https://api.github.com/users/Ben987/following{/other_user}","gists_url":"https://api.github.com/users/Ben987/gists{/gist_id}","starred_url":"https://api.github.com/users/Ben987/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Ben987/subscriptions","organizations_url":"https://api.github.com/users/Ben987/orgs","repos_url":"https://api.github.com/users/Ben987/repos","events_url":"https://api.github.com/users/Ben987/events{/privacy}","received_events_url":"https://api.github.com/users/Ben987/received_events","type":"User","site_admin":false},"repo":{"id":99595899,"name":"Bondage-College","full_name":"Ben987/Bondage-College","owner":{"login":"Ben987","id":30805159,"avatar_url":"https://avatars2.githubusercontent.com/u/30805159?v=4","gravatar_id":"","url":"https://api.github.com/users/Ben987","html_url":"https://github.com/Ben987","followers_url":"https://api.github.com/users/Ben987/followers","following_url":"https://api.github.com/users/Ben987/following{/other_user}","gists_url":"https://api.github.com/users/Ben987/gists{/gist_id}","starred_url":"https://api.github.com/users/Ben987/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Ben987/subscriptions","organizations_url":"https://api.github.com/users/Ben987/orgs","repos_url":"https://api.github.com/users/Ben987/repos","events_url":"https://api.github.com/users/Ben987/events{/privacy}","received_events_url":"https://api.github.com/users/Ben987/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/Ben987/Bondage-College","description":"Bondage College Javascript/HTML5 game","fork":false,"url":"https://api.github.com/repos/Ben987/Bondage-College","forks_url":"https://api.github.com/repos/Ben987/Bondage-College/forks","keys_url":"https://api.github.com/repos/Ben987/Bondage-College/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Ben987/Bondage-College/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Ben987/Bondage-College/teams","hooks_url":"https://api.github.com/repos/Ben987/Bondage-College/hooks","issue_events_url":"https://api.github.com/repos/Ben987/Bondage-College/issues/events{/number}","events_url":"https://api.github.com/repos/Ben987/Bondage-College/events","assignees_url":"https://api.github.com/repos/Ben987/Bondage-College/assignees{/user}","branches_url":"https://api.github.com/repos/Ben987/Bondage-College/branches{/branch}","tags_url":"https://api.github.com/repos/Ben987/Bondage-College/tags","blobs_url":"https://api.github.com/repos/Ben987/Bondage-College/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Ben987/Bondage-College/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Ben987/Bondage-College/git/refs{/sha}","trees_url":"https://api.github.com/repos/Ben987/Bondage-College/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Ben987/Bondage-College/statuses/{sha}","languages_url":"https://api.github.com/repos/Ben987/Bondage-College/languages","stargazers_url":"https://api.github.com/repos/Ben987/Bondage-College/stargazers","contributors_url":"https://api.github.com/repos/Ben987/Bondage-College/contributors","subscribers_url":"https://api.github.com/repos/Ben987/Bondage-College/subscribers","subscription_url":"https://api.github.com/repos/Ben987/Bondage-College/subscription","commits_url":"https://api.github.com/repos/Ben987/Bondage-College/commits{/sha}","git_commits_url":"https://api.github.com/repos/Ben987/Bondage-College/git/commits{/sha}","comments_url":"https://api.github.com/repos/Ben987/Bondage-College/comments{/number}","issue_comment_url":"https://api.github.com/repos/Ben987/Bondage-College/issues/comments{/number}","contents_url":"https://api.github.com/repos/Ben987/Bondage-College/contents/{+path}","compare_url":"https://api.github.com/repos/Ben987/Bondage-College/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Ben987/Bondage-College/merges","archive_url":"https://api.github.com/repos/Ben987/Bondage-College/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Ben987/Bondage-College/downloads","issues_url":"https://api.github.com/repos/Ben987/Bondage-College/issues{/number}","pulls_url":"https://api.github.com/repos/Ben987/Bondage-College/pulls{/number}","milestones_url":"https://api.github.com/repos/Ben987/Bondage-College/milestones{/number}","notifications_url":"https://api.github.com/repos/Ben987/Bondage-College/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Ben987/Bondage-College/labels{/name}","releases_url":"https://api.github.com/repos/Ben987/Bondage-College/releases{/id}","deployments_url":"https://api.github.com/repos/Ben987/Bondage-College/deployments","created_at":"2017-08-07T16:03:28Z","updated_at":"2017-09-09T14:51:31Z","pushed_at":"2017-10-08T14:36:48Z","git_url":"git://github.com/Ben987/Bondage-College.git","ssh_url":"git@github.com:Ben987/Bondage-College.git","clone_url":"https://github.com/Ben987/Bondage-College.git","svn_url":"https://github.com/Ben987/Bondage-College","homepage":null,"size":58639,"stargazers_count":7,"watchers_count":7,"language":"JavaScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":9,"mirror_url":null,"open_issues_count":2,"forks":9,"open_issues":2,"watchers":7,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/Ben987/Bondage-College/pulls/14"},"html":{"href":"https://github.com/Ben987/Bondage-College/pull/14"},"issue":{"href":"https://api.github.com/repos/Ben987/Bondage-College/issues/14"},"comments":{"href":"https://api.github.com/repos/Ben987/Bondage-College/issues/14/comments"},"review_comments":{"href":"https://api.github.com/repos/Ben987/Bondage-College/pulls/14/comments"},"review_comment":{"href":"https://api.github.com/repos/Ben987/Bondage-College/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/Ben987/Bondage-College/pulls/14/commits"},"statuses":{"href":"https://api.github.com/repos/Ben987/Bondage-College/statuses/0977e43bff250b6039678c7ebb4f4292f79da641"}},"author_association":"CONTRIBUTOR"}}
{"actor":{"display_login":"project-am"}}