GitHub PullRequestReviewCommentEvent at 2014-08-05 17:53:25
Repository: shumway
Actor: tobytailor
Payload: {"action":"created","comment":{"url":"https://api.github.com/repos/mozilla/shumway/pulls/comments/15829412","id":15829412,"diff_hunk":"@@ -211,10 +211,15 @@ module Shumway.Shell {\n     }\n   }\n \n+<<<<<<< HEAD\n   function disassembleABCFile(file: string) {\n     var buffer = read(file, \"binary\");\n     var abc = new AbcFile(new Uint8Array(buffer), file);\n     abc.trace(writer);\n+=======\n+  function parseABCs(files: string []) {\n+        //...\n+>>>>>>> nat","path":"src/shell/shell.ts","position":12,"original_position":12,"commit_id":"495ab969488c4a0e329463fa666b29dd57fc9783","original_commit_id":"495ab969488c4a0e329463fa666b29dd57fc9783","user":{"login":"tobytailor","id":153608,"avatar_url":"https://avatars.githubusercontent.com/u/153608?v=2","gravatar_id":"4c070ea4b5d033a7f5c98b08fb836a54","url":"https://api.github.com/users/tobytailor","html_url":"https://github.com/tobytailor","followers_url":"https://api.github.com/users/tobytailor/followers","following_url":"https://api.github.com/users/tobytailor/following{/other_user}","gists_url":"https://api.github.com/users/tobytailor/gists{/gist_id}","starred_url":"https://api.github.com/users/tobytailor/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tobytailor/subscriptions","organizations_url":"https://api.github.com/users/tobytailor/orgs","repos_url":"https://api.github.com/users/tobytailor/repos","events_url":"https://api.github.com/users/tobytailor/events{/privacy}","received_events_url":"https://api.github.com/users/tobytailor/received_events","type":"User","site_admin":false},"body":"Look like you had a merge conflict. This should be resolved before committing.","created_at":"2014-08-05T17:53:25Z","updated_at":"2014-08-05T17:53:25Z","html_url":"https://github.com/mozilla/shumway/pull/1534#discussion_r15829412","pull_request_url":"https://api.github.com/repos/mozilla/shumway/pulls/1534","_links":{"self":{"href":"https://api.github.com/repos/mozilla/shumway/pulls/comments/15829412"},"html":{"href":"https://github.com/mozilla/shumway/pull/1534#discussion_r15829412"},"pull_request":{"href":"https://api.github.com/repos/mozilla/shumway/pulls/1534"}}},"pull_request":{"url":"https://api.github.com/repos/mozilla/shumway/pulls/1534","id":19238508,"html_url":"https://github.com/mozilla/shumway/pull/1534","diff_url":"https://github.com/mozilla/shumway/pull/1534.diff","patch_url":"https://github.com/mozilla/shumway/pull/1534.patch","issue_url":"https://api.github.com/repos/mozilla/shumway/issues/1534","number":1534,"state":"open","title":"Lint Fixes Part 2","user":{"login":"IshanL","id":8334133,"avatar_url":"https://avatars.githubusercontent.com/u/8334133?v=2","gravatar_id":"533bf7f07e14328894de9312db3bc5d0","url":"https://api.github.com/users/IshanL","html_url":"https://github.com/IshanL","followers_url":"https://api.github.com/users/IshanL/followers","following_url":"https://api.github.com/users/IshanL/following{/other_user}","gists_url":"https://api.github.com/users/IshanL/gists{/gist_id}","starred_url":"https://api.github.com/users/IshanL/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/IshanL/subscriptions","organizations_url":"https://api.github.com/users/IshanL/orgs","repos_url":"https://api.github.com/users/IshanL/repos","events_url":"https://api.github.com/users/IshanL/events{/privacy}","received_events_url":"https://api.github.com/users/IshanL/received_events","type":"User","site_admin":false},"body":"","created_at":"2014-08-01T22:58:52Z","updated_at":"2014-08-05T17:53:25Z","closed_at":null,"merged_at":null,"merge_commit_sha":"e5fbece63c7280510c9caa9e2a7f329e56a84efa","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/mozilla/shumway/pulls/1534/commits","review_comments_url":"https://api.github.com/repos/mozilla/shumway/pulls/1534/comments","review_comment_url":"https://api.github.com/repos/mozilla/shumway/pulls/comments/{number}","comments_url":"https://api.github.com/repos/mozilla/shumway/issues/1534/comments","statuses_url":"https://api.github.com/repos/mozilla/shumway/statuses/495ab969488c4a0e329463fa666b29dd57fc9783","head":{"label":"IshanL:master","ref":"master","sha":"495ab969488c4a0e329463fa666b29dd57fc9783","user":{"login":"IshanL","id":8334133,"avatar_url":"https://avatars.githubusercontent.com/u/8334133?v=2","gravatar_id":"533bf7f07e14328894de9312db3bc5d0","url":"https://api.github.com/users/IshanL","html_url":"https://github.com/IshanL","followers_url":"https://api.github.com/users/IshanL/followers","following_url":"https://api.github.com/users/IshanL/following{/other_user}","gists_url":"https://api.github.com/users/IshanL/gists{/gist_id}","starred_url":"https://api.github.com/users/IshanL/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/IshanL/subscriptions","organizations_url":"https://api.github.com/users/IshanL/orgs","repos_url":"https://api.github.com/users/IshanL/repos","events_url":"https://api.github.com/users/IshanL/events{/privacy}","received_events_url":"https://api.github.com/users/IshanL/received_events","type":"User","site_admin":false},"repo":{"id":22532102,"name":"shumway","full_name":"IshanL/shumway","owner":{"login":"IshanL","id":8334133,"avatar_url":"https://avatars.githubusercontent.com/u/8334133?v=2","gravatar_id":"533bf7f07e14328894de9312db3bc5d0","url":"https://api.github.com/users/IshanL","html_url":"https://github.com/IshanL","followers_url":"https://api.github.com/users/IshanL/followers","following_url":"https://api.github.com/users/IshanL/following{/other_user}","gists_url":"https://api.github.com/users/IshanL/gists{/gist_id}","starred_url":"https://api.github.com/users/IshanL/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/IshanL/subscriptions","organizations_url":"https://api.github.com/users/IshanL/orgs","repos_url":"https://api.github.com/users/IshanL/repos","events_url":"https://api.github.com/users/IshanL/events{/privacy}","received_events_url":"https://api.github.com/users/IshanL/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/IshanL/shumway","description":"Shumway is a Flash VM and runtime written in JavaScript","fork":true,"url":"https://api.github.com/repos/IshanL/shumway","forks_url":"https://api.github.com/repos/IshanL/shumway/forks","keys_url":"https://api.github.com/repos/IshanL/shumway/keys{/key_id}","collaborators_url":"https://api.github.com/repos/IshanL/shumway/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/IshanL/shumway/teams","hooks_url":"https://api.github.com/repos/IshanL/shumway/hooks","issue_events_url":"https://api.github.com/repos/IshanL/shumway/issues/events{/number}","events_url":"https://api.github.com/repos/IshanL/shumway/events","assignees_url":"https://api.github.com/repos/IshanL/shumway/assignees{/user}","branches_url":"https://api.github.com/repos/IshanL/shumway/branches{/branch}","tags_url":"https://api.github.com/repos/IshanL/shumway/tags","blobs_url":"https://api.github.com/repos/IshanL/shumway/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/IshanL/shumway/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/IshanL/shumway/git/refs{/sha}","trees_url":"https://api.github.com/repos/IshanL/shumway/git/trees{/sha}","statuses_url":"https://api.github.com/repos/IshanL/shumway/statuses/{sha}","languages_url":"https://api.github.com/repos/IshanL/shumway/languages","stargazers_url":"https://api.github.com/repos/IshanL/shumway/stargazers","contributors_url":"https://api.github.com/repos/IshanL/shumway/contributors","subscribers_url":"https://api.github.com/repos/IshanL/shumway/subscribers","subscription_url":"https://api.github.com/repos/IshanL/shumway/subscription","commits_url":"https://api.github.com/repos/IshanL/shumway/commits{/sha}","git_commits_url":"https://api.github.com/repos/IshanL/shumway/git/commits{/sha}","comments_url":"https://api.github.com/repos/IshanL/shumway/comments{/number}","issue_comment_url":"https://api.github.com/repos/IshanL/shumway/issues/comments/{number}","contents_url":"https://api.github.com/repos/IshanL/shumway/contents/{+path}","compare_url":"https://api.github.com/repos/IshanL/shumway/compare/{base}...{head}","merges_url":"https://api.github.com/repos/IshanL/shumway/merges","archive_url":"https://api.github.com/repos/IshanL/shumway/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/IshanL/shumway/downloads","issues_url":"https://api.github.com/repos/IshanL/shumway/issues{/number}","pulls_url":"https://api.github.com/repos/IshanL/shumway/pulls{/number}","milestones_url":"https://api.github.com/repos/IshanL/shumway/milestones{/number}","notifications_url":"https://api.github.com/repos/IshanL/shumway/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/IshanL/shumway/labels{/name}","releases_url":"https://api.github.com/repos/IshanL/shumway/releases{/id}","created_at":"2014-08-01T22:47:59Z","updated_at":"2014-08-01T22:58:32Z","pushed_at":"2014-08-01T22:58:29Z","git_url":"git://github.com/IshanL/shumway.git","ssh_url":"git@github.com:IshanL/shumway.git","clone_url":"https://github.com/IshanL/shumway.git","svn_url":"https://github.com/IshanL/shumway","homepage":"","size":102427,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":false,"has_downloads":true,"has_wiki":true,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"mozilla:master","ref":"master","sha":"1923f700b7c585412255d07a70e80fb830a6a9c0","user":{"login":"mozilla","id":131524,"avatar_url":"https://avatars.githubusercontent.com/u/131524?v=2","gravatar_id":"9ba739c8f3288e256b13553e4d257b5e","url":"https://api.github.com/users/mozilla","html_url":"https://github.com/mozilla","followers_url":"https://api.github.com/users/mozilla/followers","following_url":"https://api.github.com/users/mozilla/following{/other_user}","gists_url":"https://api.github.com/users/mozilla/gists{/gist_id}","starred_url":"https://api.github.com/users/mozilla/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mozilla/subscriptions","organizations_url":"https://api.github.com/users/mozilla/orgs","repos_url":"https://api.github.com/users/mozilla/repos","events_url":"https://api.github.com/users/mozilla/events{/privacy}","received_events_url":"https://api.github.com/users/mozilla/received_events","type":"Organization","site_admin":false},"repo":{"id":3006455,"name":"shumway","full_name":"mozilla/shumway","owner":{"login":"mozilla","id":131524,"avatar_url":"https://avatars.githubusercontent.com/u/131524?v=2","gravatar_id":"9ba739c8f3288e256b13553e4d257b5e","url":"https://api.github.com/users/mozilla","html_url":"https://github.com/mozilla","followers_url":"https://api.github.com/users/mozilla/followers","following_url":"https://api.github.com/users/mozilla/following{/other_user}","gists_url":"https://api.github.com/users/mozilla/gists{/gist_id}","starred_url":"https://api.github.com/users/mozilla/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mozilla/subscriptions","organizations_url":"https://api.github.com/users/mozilla/orgs","repos_url":"https://api.github.com/users/mozilla/repos","events_url":"https://api.github.com/users/mozilla/events{/privacy}","received_events_url":"https://api.github.com/users/mozilla/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/mozilla/shumway","description":"Shumway is a Flash VM and runtime written in JavaScript","fork":false,"url":"https://api.github.com/repos/mozilla/shumway","forks_url":"https://api.github.com/repos/mozilla/shumway/forks","keys_url":"https://api.github.com/repos/mozilla/shumway/keys{/key_id}","collaborators_url":"https://api.github.com/repos/mozilla/shumway/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/mozilla/shumway/teams","hooks_url":"https://api.github.com/repos/mozilla/shumway/hooks","issue_events_url":"https://api.github.com/repos/mozilla/shumway/issues/events{/number}","events_url":"https://api.github.com/repos/mozilla/shumway/events","assignees_url":"https://api.github.com/repos/mozilla/shumway/assignees{/user}","branches_url":"https://api.github.com/repos/mozilla/shumway/branches{/branch}","tags_url":"https://api.github.com/repos/mozilla/shumway/tags","blobs_url":"https://api.github.com/repos/mozilla/shumway/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/mozilla/shumway/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/mozilla/shumway/git/refs{/sha}","trees_url":"https://api.github.com/repos/mozilla/shumway/git/trees{/sha}","statuses_url":"https://api.github.com/repos/mozilla/shumway/statuses/{sha}","languages_url":"https://api.github.com/repos/mozilla/shumway/languages","stargazers_url":"https://api.github.com/repos/mozilla/shumway/stargazers","contributors_url":"https://api.github.com/repos/mozilla/shumway/contributors","subscribers_url":"https://api.github.com/repos/mozilla/shumway/subscribers","subscription_url":"https://api.github.com/repos/mozilla/shumway/subscription","commits_url":"https://api.github.com/repos/mozilla/shumway/commits{/sha}","git_commits_url":"https://api.github.com/repos/mozilla/shumway/git/commits{/sha}","comments_url":"https://api.github.com/repos/mozilla/shumway/comments{/number}","issue_comment_url":"https://api.github.com/repos/mozilla/shumway/issues/comments/{number}","contents_url":"https://api.github.com/repos/mozilla/shumway/contents/{+path}","compare_url":"https://api.github.com/repos/mozilla/shumway/compare/{base}...{head}","merges_url":"https://api.github.com/repos/mozilla/shumway/merges","archive_url":"https://api.github.com/repos/mozilla/shumway/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/mozilla/shumway/downloads","issues_url":"https://api.github.com/repos/mozilla/shumway/issues{/number}","pulls_url":"https://api.github.com/repos/mozilla/shumway/pulls{/number}","milestones_url":"https://api.github.com/repos/mozilla/shumway/milestones{/number}","notifications_url":"https://api.github.com/repos/mozilla/shumway/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/mozilla/shumway/labels{/name}","releases_url":"https://api.github.com/repos/mozilla/shumway/releases{/id}","created_at":"2011-12-18T15:22:51Z","updated_at":"2014-08-05T02:08:25Z","pushed_at":"2014-08-05T00:46:45Z","git_url":"git://github.com/mozilla/shumway.git","ssh_url":"git@github.com:mozilla/shumway.git","clone_url":"https://github.com/mozilla/shumway.git","svn_url":"https://github.com/mozilla/shumway","homepage":"","size":127389,"stargazers_count":2347,"watchers_count":2347,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"forks_count":225,"mirror_url":null,"open_issues_count":360,"forks":225,"open_issues":360,"watchers":2347,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/mozilla/shumway/pulls/1534"},"html":{"href":"https://github.com/mozilla/shumway/pull/1534"},"issue":{"href":"https://api.github.com/repos/mozilla/shumway/issues/1534"},"comments":{"href":"https://api.github.com/repos/mozilla/shumway/issues/1534/comments"},"review_comments":{"href":"https://api.github.com/repos/mozilla/shumway/pulls/1534/comments"},"review_comment":{"href":"https://api.github.com/repos/mozilla/shumway/pulls/comments/{number}"},"commits":{"href":"https://api.github.com/repos/mozilla/shumway/pulls/1534/commits"},"statuses":{"href":"https://api.github.com/repos/mozilla/shumway/statuses/495ab969488c4a0e329463fa666b29dd57fc9783"}}}}