{"action":"closed","number":27,"pull_request":{"url":"https://api.github.com/repos/mozilla-services/cliquetis/pulls/27","id":38049848,"html_url":"https://github.com/mozilla-services/cliquetis/pull/27","diff_url":"https://github.com/mozilla-services/cliquetis/pull/27.diff","patch_url":"https://github.com/mozilla-services/cliquetis/pull/27.patch","issue_url":"https://api.github.com/repos/mozilla-services/cliquetis/issues/27","number":27,"state":"closed","locked":false,"title":"Fixes #25 - Conflict resolution helper.","user":{"login":"n1k0","id":41547,"avatar_url":"https://avatars.githubusercontent.com/u/41547?v=3","gravatar_id":"","url":"https://api.github.com/users/n1k0","html_url":"https://github.com/n1k0","followers_url":"https://api.github.com/users/n1k0/followers","following_url":"https://api.github.com/users/n1k0/following{/other_user}","gists_url":"https://api.github.com/users/n1k0/gists{/gist_id}","starred_url":"https://api.github.com/users/n1k0/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/n1k0/subscriptions","organizations_url":"https://api.github.com/users/n1k0/orgs","repos_url":"https://api.github.com/users/n1k0/repos","events_url":"https://api.github.com/users/n1k0/events{/privacy}","received_events_url":"https://api.github.com/users/n1k0/received_events","type":"User","site_admin":false},"body":"Refs #25. I took the bare minimum approach here, though seems to serve the purpose.\r\n\r\nDocs will be updated along #21.\r\n\r\nr=? @leplatrem @ametaireau @Natim ","created_at":"2015-06-18T20:35:03Z","updated_at":"2015-06-19T07:30:58Z","closed_at":"2015-06-19T07:30:58Z","merged_at":"2015-06-19T07:30:58Z","merge_commit_sha":"1479b37bdebd6e27d804b706754fe9f50bd286a1","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/mozilla-services/cliquetis/pulls/27/commits","review_comments_url":"https://api.github.com/repos/mozilla-services/cliquetis/pulls/27/comments","review_comment_url":"https://api.github.com/repos/mozilla-services/cliquetis/pulls/comments{/number}","comments_url":"https://api.github.com/repos/mozilla-services/cliquetis/issues/27/comments","statuses_url":"https://api.github.com/repos/mozilla-services/cliquetis/statuses/ecf0f618b1b2276636f906bf4c966763fc3f6c3f","head":{"label":"mozilla-services:conflict-resolution-helper","ref":"conflict-resolution-helper","sha":"ecf0f618b1b2276636f906bf4c966763fc3f6c3f","user":{"login":"mozilla-services","id":1066228,"avatar_url":"https://avatars.githubusercontent.com/u/1066228?v=3","gravatar_id":"","url":"https://api.github.com/users/mozilla-services","html_url":"https://github.com/mozilla-services","followers_url":"https://api.github.com/users/mozilla-services/followers","following_url":"https://api.github.com/users/mozilla-services/following{/other_user}","gists_url":"https://api.github.com/users/mozilla-services/gists{/gist_id}","starred_url":"https://api.github.com/users/mozilla-services/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mozilla-services/subscriptions","organizations_url":"https://api.github.com/users/mozilla-services/orgs","repos_url":"https://api.github.com/users/mozilla-services/repos","events_url":"https://api.github.com/users/mozilla-services/events{/privacy}","received_events_url":"https://api.github.com/users/mozilla-services/received_events","type":"Organization","site_admin":false},"repo":{"id":35978199,"name":"cliquetis","full_name":"mozilla-services/cliquetis","owner":{"login":"mozilla-services","id":1066228,"avatar_url":"https://avatars.githubusercontent.com/u/1066228?v=3","gravatar_id":"","url":"https://api.github.com/users/mozilla-services","html_url":"https://github.com/mozilla-services","followers_url":"https://api.github.com/users/mozilla-services/followers","following_url":"https://api.github.com/users/mozilla-services/following{/other_user}","gists_url":"https://api.github.com/users/mozilla-services/gists{/gist_id}","starred_url":"https://api.github.com/users/mozilla-services/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mozilla-services/subscriptions","organizations_url":"https://api.github.com/users/mozilla-services/orgs","repos_url":"https://api.github.com/users/mozilla-services/repos","events_url":"https://api.github.com/users/mozilla-services/events{/privacy}","received_events_url":"https://api.github.com/users/mozilla-services/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/mozilla-services/cliquetis","description":"A JavaScript client for Cliquet and Kinto.","fork":false,"url":"https://api.github.com/repos/mozilla-services/cliquetis","forks_url":"https://api.github.com/repos/mozilla-services/cliquetis/forks","keys_url":"https://api.github.com/repos/mozilla-services/cliquetis/keys{/key_id}","collaborators_url":"https://api.github.com/repos/mozilla-services/cliquetis/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/mozilla-services/cliquetis/teams","hooks_url":"https://api.github.com/repos/mozilla-services/cliquetis/hooks","issue_events_url":"https://api.github.com/repos/mozilla-services/cliquetis/issues/events{/number}","events_url":"https://api.github.com/repos/mozilla-services/cliquetis/events","assignees_url":"https://api.github.com/repos/mozilla-services/cliquetis/assignees{/user}","branches_url":"https://api.github.com/repos/mozilla-services/cliquetis/branches{/branch}","tags_url":"https://api.github.com/repos/mozilla-services/cliquetis/tags","blobs_url":"https://api.github.com/repos/mozilla-services/cliquetis/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/mozilla-services/cliquetis/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/mozilla-services/cliquetis/git/refs{/sha}","trees_url":"https://api.github.com/repos/mozilla-services/cliquetis/git/trees{/sha}","statuses_url":"https://api.github.com/repos/mozilla-services/cliquetis/statuses/{sha}","languages_url":"https://api.github.com/repos/mozilla-services/cliquetis/languages","stargazers_url":"https://api.github.com/repos/mozilla-services/cliquetis/stargazers","contributors_url":"https://api.github.com/repos/mozilla-services/cliquetis/contributors","subscribers_url":"https://api.github.com/repos/mozilla-services/cliquetis/subscribers","subscription_url":"https://api.github.com/repos/mozilla-services/cliquetis/subscription","commits_url":"https://api.github.com/repos/mozilla-services/cliquetis/commits{/sha}","git_commits_url":"https://api.github.com/repos/mozilla-services/cliquetis/git/commits{/sha}","comments_url":"https://api.github.com/repos/mozilla-services/cliquetis/comments{/number}","issue_comment_url":"https://api.github.com/repos/mozilla-services/cliquetis/issues/comments{/number}","contents_url":"https://api.github.com/repos/mozilla-services/cliquetis/contents/{+path}","compare_url":"https://api.github.com/repos/mozilla-services/cliquetis/compare/{base}...{head}","merges_url":"https://api.github.com/repos/mozilla-services/cliquetis/merges","archive_url":"https://api.github.com/repos/mozilla-services/cliquetis/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/mozilla-services/cliquetis/downloads","issues_url":"https://api.github.com/repos/mozilla-services/cliquetis/issues{/number}","pulls_url":"https://api.github.com/repos/mozilla-services/cliquetis/pulls{/number}","milestones_url":"https://api.github.com/repos/mozilla-services/cliquetis/milestones{/number}","notifications_url":"https://api.github.com/repos/mozilla-services/cliquetis/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/mozilla-services/cliquetis/labels{/name}","releases_url":"https://api.github.com/repos/mozilla-services/cliquetis/releases{/id}","created_at":"2015-05-20T22:46:31Z","updated_at":"2015-06-18T11:17:50Z","pushed_at":"2015-06-19T07:30:58Z","git_url":"git://github.com/mozilla-services/cliquetis.git","ssh_url":"git@github.com:mozilla-services/cliquetis.git","clone_url":"https://github.com/mozilla-services/cliquetis.git","svn_url":"https://github.com/mozilla-services/cliquetis","homepage":"","size":1087,"stargazers_count":3,"watchers_count":3,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":18,"forks":0,"open_issues":18,"watchers":3,"default_branch":"master"}},"base":{"label":"mozilla-services:master","ref":"master","sha":"3441298740e0905f8a9bd96f2472b7ed33acde0b","user":{"login":"mozilla-services","id":1066228,"avatar_url":"https://avatars.githubusercontent.com/u/1066228?v=3","gravatar_id":"","url":"https://api.github.com/users/mozilla-services","html_url":"https://github.com/mozilla-services","followers_url":"https://api.github.com/users/mozilla-services/followers","following_url":"https://api.github.com/users/mozilla-services/following{/other_user}","gists_url":"https://api.github.com/users/mozilla-services/gists{/gist_id}","starred_url":"https://api.github.com/users/mozilla-services/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mozilla-services/subscriptions","organizations_url":"https://api.github.com/users/mozilla-services/orgs","repos_url":"https://api.github.com/users/mozilla-services/repos","events_url":"https://api.github.com/users/mozilla-services/events{/privacy}","received_events_url":"https://api.github.com/users/mozilla-services/received_events","type":"Organization","site_admin":false},"repo":{"id":35978199,"name":"cliquetis","full_name":"mozilla-services/cliquetis","owner":{"login":"mozilla-services","id":1066228,"avatar_url":"https://avatars.githubusercontent.com/u/1066228?v=3","gravatar_id":"","url":"https://api.github.com/users/mozilla-services","html_url":"https://github.com/mozilla-services","followers_url":"https://api.github.com/users/mozilla-services/followers","following_url":"https://api.github.com/users/mozilla-services/following{/other_user}","gists_url":"https://api.github.com/users/mozilla-services/gists{/gist_id}","starred_url":"https://api.github.com/users/mozilla-services/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mozilla-services/subscriptions","organizations_url":"https://api.github.com/users/mozilla-services/orgs","repos_url":"https://api.github.com/users/mozilla-services/repos","events_url":"https://api.github.com/users/mozilla-services/events{/privacy}","received_events_url":"https://api.github.com/users/mozilla-services/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/mozilla-services/cliquetis","description":"A JavaScript client for Cliquet and Kinto.","fork":false,"url":"https://api.github.com/repos/mozilla-services/cliquetis","forks_url":"https://api.github.com/repos/mozilla-services/cliquetis/forks","keys_url":"https://api.github.com/repos/mozilla-services/cliquetis/keys{/key_id}","collaborators_url":"https://api.github.com/repos/mozilla-services/cliquetis/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/mozilla-services/cliquetis/teams","hooks_url":"https://api.github.com/repos/mozilla-services/cliquetis/hooks","issue_events_url":"https://api.github.com/repos/mozilla-services/cliquetis/issues/events{/number}","events_url":"https://api.github.com/repos/mozilla-services/cliquetis/events","assignees_url":"https://api.github.com/repos/mozilla-services/cliquetis/assignees{/user}","branches_url":"https://api.github.com/repos/mozilla-services/cliquetis/branches{/branch}","tags_url":"https://api.github.com/repos/mozilla-services/cliquetis/tags","blobs_url":"https://api.github.com/repos/mozilla-services/cliquetis/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/mozilla-services/cliquetis/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/mozilla-services/cliquetis/git/refs{/sha}","trees_url":"https://api.github.com/repos/mozilla-services/cliquetis/git/trees{/sha}","statuses_url":"https://api.github.com/repos/mozilla-services/cliquetis/statuses/{sha}","languages_url":"https://api.github.com/repos/mozilla-services/cliquetis/languages","stargazers_url":"https://api.github.com/repos/mozilla-services/cliquetis/stargazers","contributors_url":"https://api.github.com/repos/mozilla-services/cliquetis/contributors","subscribers_url":"https://api.github.com/repos/mozilla-services/cliquetis/subscribers","subscription_url":"https://api.github.com/repos/mozilla-services/cliquetis/subscription","commits_url":"https://api.github.com/repos/mozilla-services/cliquetis/commits{/sha}","git_commits_url":"https://api.github.com/repos/mozilla-services/cliquetis/git/commits{/sha}","comments_url":"https://api.github.com/repos/mozilla-services/cliquetis/comments{/number}","issue_comment_url":"https://api.github.com/repos/mozilla-services/cliquetis/issues/comments{/number}","contents_url":"https://api.github.com/repos/mozilla-services/cliquetis/contents/{+path}","compare_url":"https://api.github.com/repos/mozilla-services/cliquetis/compare/{base}...{head}","merges_url":"https://api.github.com/repos/mozilla-services/cliquetis/merges","archive_url":"https://api.github.com/repos/mozilla-services/cliquetis/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/mozilla-services/cliquetis/downloads","issues_url":"https://api.github.com/repos/mozilla-services/cliquetis/issues{/number}","pulls_url":"https://api.github.com/repos/mozilla-services/cliquetis/pulls{/number}","milestones_url":"https://api.github.com/repos/mozilla-services/cliquetis/milestones{/number}","notifications_url":"https://api.github.com/repos/mozilla-services/cliquetis/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/mozilla-services/cliquetis/labels{/name}","releases_url":"https://api.github.com/repos/mozilla-services/cliquetis/releases{/id}","created_at":"2015-05-20T22:46:31Z","updated_at":"2015-06-18T11:17:50Z","pushed_at":"2015-06-19T07:30:58Z","git_url":"git://github.com/mozilla-services/cliquetis.git","ssh_url":"git@github.com:mozilla-services/cliquetis.git","clone_url":"https://github.com/mozilla-services/cliquetis.git","svn_url":"https://github.com/mozilla-services/cliquetis","homepage":"","size":1087,"stargazers_count":3,"watchers_count":3,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":18,"forks":0,"open_issues":18,"watchers":3,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/mozilla-services/cliquetis/pulls/27"},"html":{"href":"https://github.com/mozilla-services/cliquetis/pull/27"},"issue":{"href":"https://api.github.com/repos/mozilla-services/cliquetis/issues/27"},"comments":{"href":"https://api.github.com/repos/mozilla-services/cliquetis/issues/27/comments"},"review_comments":{"href":"https://api.github.com/repos/mozilla-services/cliquetis/pulls/27/comments"},"review_comment":{"href":"https://api.github.com/repos/mozilla-services/cliquetis/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/mozilla-services/cliquetis/pulls/27/commits"},"statuses":{"href":"https://api.github.com/repos/mozilla-services/cliquetis/statuses/ecf0f618b1b2276636f906bf4c966763fc3f6c3f"}},"merged":true,"mergeable":null,"mergeable_state":"unknown","merged_by":{"login":"n1k0","id":41547,"avatar_url":"https://avatars.githubusercontent.com/u/41547?v=3","gravatar_id":"","url":"https://api.github.com/users/n1k0","html_url":"https://github.com/n1k0","followers_url":"https://api.github.com/users/n1k0/followers","following_url":"https://api.github.com/users/n1k0/following{/other_user}","gists_url":"https://api.github.com/users/n1k0/gists{/gist_id}","starred_url":"https://api.github.com/users/n1k0/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/n1k0/subscriptions","organizations_url":"https://api.github.com/users/n1k0/orgs","repos_url":"https://api.github.com/users/n1k0/repos","events_url":"https://api.github.com/users/n1k0/events{/privacy}","received_events_url":"https://api.github.com/users/n1k0/received_events","type":"User","site_admin":false},"comments":1,"review_comments":1,"commits":2,"additions":55,"deletions":2,"changed_files":2}}