{"action":"created","comment":{"url":"https://api.github.com/repos/xwp/wp-customize-snapshots/pulls/comments/155712820","pull_request_review_id":82077057,"id":155712820,"diff_hunk":"@@ -640,6 +645,62 @@ public function render_templates() {\n \n \t\t\t<# } #>\n \t\t</script>\n+\n+\t\t<script type=\"text/html\" id=\"tmpl-snapshot-conflict-button\">\n+\t\t\t<?php $title_text = __( 'has potential conflicts (click to expand)', 'customize-snapshots' ); ?>","path":"php/class-customize-snapshot-manager.php","position":43,"original_position":43,"commit_id":"093dfc8c3146962489acab8695cc1a6f4112bbb9","original_commit_id":"f1aca7aa401e68f18f4889c576c3b6227502af42","user":{"login":"westonruter","id":134745,"avatar_url":"https://avatars2.githubusercontent.com/u/134745?v=4","gravatar_id":"","url":"https://api.github.com/users/westonruter","html_url":"https://github.com/westonruter","followers_url":"https://api.github.com/users/westonruter/followers","following_url":"https://api.github.com/users/westonruter/following{/other_user}","gists_url":"https://api.github.com/users/westonruter/gists{/gist_id}","starred_url":"https://api.github.com/users/westonruter/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/westonruter/subscriptions","organizations_url":"https://api.github.com/users/westonruter/orgs","repos_url":"https://api.github.com/users/westonruter/repos","events_url":"https://api.github.com/users/westonruter/events{/privacy}","received_events_url":"https://api.github.com/users/westonruter/received_events","type":"User","site_admin":false},"body":"This will be problematic to translate.","created_at":"2017-12-08T06:47:08Z","updated_at":"2017-12-08T06:59:01Z","html_url":"https://github.com/xwp/wp-customize-snapshots/pull/71#discussion_r155712820","pull_request_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/pulls/71","author_association":"OWNER","_links":{"self":{"href":"https://api.github.com/repos/xwp/wp-customize-snapshots/pulls/comments/155712820"},"html":{"href":"https://github.com/xwp/wp-customize-snapshots/pull/71#discussion_r155712820"},"pull_request":{"href":"https://api.github.com/repos/xwp/wp-customize-snapshots/pulls/71"}}},"pull_request":{"url":"https://api.github.com/repos/xwp/wp-customize-snapshots/pulls/71","id":80615653,"html_url":"https://github.com/xwp/wp-customize-snapshots/pull/71","diff_url":"https://github.com/xwp/wp-customize-snapshots/pull/71.diff","patch_url":"https://github.com/xwp/wp-customize-snapshots/pull/71.patch","issue_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/issues/71","number":71,"state":"open","locked":false,"title":"Snapshot Conflicts ","user":{"login":"PatelUtkarsh","id":5015489,"avatar_url":"https://avatars1.githubusercontent.com/u/5015489?v=4","gravatar_id":"","url":"https://api.github.com/users/PatelUtkarsh","html_url":"https://github.com/PatelUtkarsh","followers_url":"https://api.github.com/users/PatelUtkarsh/followers","following_url":"https://api.github.com/users/PatelUtkarsh/following{/other_user}","gists_url":"https://api.github.com/users/PatelUtkarsh/gists{/gist_id}","starred_url":"https://api.github.com/users/PatelUtkarsh/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/PatelUtkarsh/subscriptions","organizations_url":"https://api.github.com/users/PatelUtkarsh/orgs","repos_url":"https://api.github.com/users/PatelUtkarsh/repos","events_url":"https://api.github.com/users/PatelUtkarsh/events{/privacy}","received_events_url":"https://api.github.com/users/PatelUtkarsh/received_events","type":"User","site_admin":false},"body":"Fixes #22 \r\n\r\n","created_at":"2016-08-09T13:00:21Z","updated_at":"2017-12-08T06:59:02Z","closed_at":null,"merged_at":null,"merge_commit_sha":"cf173ef12594eef1476a67b8001e507767b9ae4e","assignee":null,"assignees":[],"requested_reviewers":[],"milestone":{"url":"https://api.github.com/repos/xwp/wp-customize-snapshots/milestones/7","html_url":"https://github.com/xwp/wp-customize-snapshots/milestone/7","labels_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/milestones/7/labels","id":2302899,"number":7,"title":"Next Major Release","description":"","creator":{"login":"westonruter","id":134745,"avatar_url":"https://avatars2.githubusercontent.com/u/134745?v=4","gravatar_id":"","url":"https://api.github.com/users/westonruter","html_url":"https://github.com/westonruter","followers_url":"https://api.github.com/users/westonruter/followers","following_url":"https://api.github.com/users/westonruter/following{/other_user}","gists_url":"https://api.github.com/users/westonruter/gists{/gist_id}","starred_url":"https://api.github.com/users/westonruter/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/westonruter/subscriptions","organizations_url":"https://api.github.com/users/westonruter/orgs","repos_url":"https://api.github.com/users/westonruter/repos","events_url":"https://api.github.com/users/westonruter/events{/privacy}","received_events_url":"https://api.github.com/users/westonruter/received_events","type":"User","site_admin":false},"open_issues":7,"closed_issues":0,"state":"open","created_at":"2017-02-06T14:55:20Z","updated_at":"2017-10-30T17:27:59Z","due_on":null,"closed_at":null},"commits_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/pulls/71/commits","review_comments_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/pulls/71/comments","review_comment_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/pulls/comments{/number}","comments_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/issues/71/comments","statuses_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/statuses/093dfc8c3146962489acab8695cc1a6f4112bbb9","head":{"label":"xwp:feature/conflicts","ref":"feature/conflicts","sha":"093dfc8c3146962489acab8695cc1a6f4112bbb9","user":{"login":"xwp","id":9003139,"avatar_url":"https://avatars2.githubusercontent.com/u/9003139?v=4","gravatar_id":"","url":"https://api.github.com/users/xwp","html_url":"https://github.com/xwp","followers_url":"https://api.github.com/users/xwp/followers","following_url":"https://api.github.com/users/xwp/following{/other_user}","gists_url":"https://api.github.com/users/xwp/gists{/gist_id}","starred_url":"https://api.github.com/users/xwp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/xwp/subscriptions","organizations_url":"https://api.github.com/users/xwp/orgs","repos_url":"https://api.github.com/users/xwp/repos","events_url":"https://api.github.com/users/xwp/events{/privacy}","received_events_url":"https://api.github.com/users/xwp/received_events","type":"Organization","site_admin":false},"repo":{"id":45574788,"name":"wp-customize-snapshots","full_name":"xwp/wp-customize-snapshots","owner":{"login":"xwp","id":9003139,"avatar_url":"https://avatars2.githubusercontent.com/u/9003139?v=4","gravatar_id":"","url":"https://api.github.com/users/xwp","html_url":"https://github.com/xwp","followers_url":"https://api.github.com/users/xwp/followers","following_url":"https://api.github.com/users/xwp/following{/other_user}","gists_url":"https://api.github.com/users/xwp/gists{/gist_id}","starred_url":"https://api.github.com/users/xwp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/xwp/subscriptions","organizations_url":"https://api.github.com/users/xwp/orgs","repos_url":"https://api.github.com/users/xwp/repos","events_url":"https://api.github.com/users/xwp/events{/privacy}","received_events_url":"https://api.github.com/users/xwp/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/xwp/wp-customize-snapshots","description":"Customize Snapshots WordPress Plugin","fork":false,"url":"https://api.github.com/repos/xwp/wp-customize-snapshots","forks_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/forks","keys_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/keys{/key_id}","collaborators_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/teams","hooks_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/hooks","issue_events_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/issues/events{/number}","events_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/events","assignees_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/assignees{/user}","branches_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/branches{/branch}","tags_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/tags","blobs_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/git/refs{/sha}","trees_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/git/trees{/sha}","statuses_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/statuses/{sha}","languages_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/languages","stargazers_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/stargazers","contributors_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/contributors","subscribers_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/subscribers","subscription_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/subscription","commits_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/commits{/sha}","git_commits_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/git/commits{/sha}","comments_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/comments{/number}","issue_comment_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/issues/comments{/number}","contents_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/contents/{+path}","compare_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/compare/{base}...{head}","merges_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/merges","archive_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/downloads","issues_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/issues{/number}","pulls_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/pulls{/number}","milestones_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/milestones{/number}","notifications_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/labels{/name}","releases_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/releases{/id}","deployments_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/deployments","created_at":"2015-11-04T23:42:20Z","updated_at":"2017-12-07T16:27:00Z","pushed_at":"2017-12-08T06:58:59Z","git_url":"git://github.com/xwp/wp-customize-snapshots.git","ssh_url":"git@github.com:xwp/wp-customize-snapshots.git","clone_url":"https://github.com/xwp/wp-customize-snapshots.git","svn_url":"https://github.com/xwp/wp-customize-snapshots","homepage":"https://wordpress.org/plugins/customize-snapshots/","size":3109,"stargazers_count":42,"watchers_count":42,"language":"PHP","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":8,"mirror_url":null,"archived":false,"open_issues_count":24,"license":null,"forks":8,"open_issues":24,"watchers":42,"default_branch":"develop"}},"base":{"label":"xwp:develop","ref":"develop","sha":"74b64bfd3031f15fbc88350607566e1dbddbdcf7","user":{"login":"xwp","id":9003139,"avatar_url":"https://avatars2.githubusercontent.com/u/9003139?v=4","gravatar_id":"","url":"https://api.github.com/users/xwp","html_url":"https://github.com/xwp","followers_url":"https://api.github.com/users/xwp/followers","following_url":"https://api.github.com/users/xwp/following{/other_user}","gists_url":"https://api.github.com/users/xwp/gists{/gist_id}","starred_url":"https://api.github.com/users/xwp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/xwp/subscriptions","organizations_url":"https://api.github.com/users/xwp/orgs","repos_url":"https://api.github.com/users/xwp/repos","events_url":"https://api.github.com/users/xwp/events{/privacy}","received_events_url":"https://api.github.com/users/xwp/received_events","type":"Organization","site_admin":false},"repo":{"id":45574788,"name":"wp-customize-snapshots","full_name":"xwp/wp-customize-snapshots","owner":{"login":"xwp","id":9003139,"avatar_url":"https://avatars2.githubusercontent.com/u/9003139?v=4","gravatar_id":"","url":"https://api.github.com/users/xwp","html_url":"https://github.com/xwp","followers_url":"https://api.github.com/users/xwp/followers","following_url":"https://api.github.com/users/xwp/following{/other_user}","gists_url":"https://api.github.com/users/xwp/gists{/gist_id}","starred_url":"https://api.github.com/users/xwp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/xwp/subscriptions","organizations_url":"https://api.github.com/users/xwp/orgs","repos_url":"https://api.github.com/users/xwp/repos","events_url":"https://api.github.com/users/xwp/events{/privacy}","received_events_url":"https://api.github.com/users/xwp/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/xwp/wp-customize-snapshots","description":"Customize Snapshots WordPress Plugin","fork":false,"url":"https://api.github.com/repos/xwp/wp-customize-snapshots","forks_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/forks","keys_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/keys{/key_id}","collaborators_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/teams","hooks_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/hooks","issue_events_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/issues/events{/number}","events_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/events","assignees_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/assignees{/user}","branches_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/branches{/branch}","tags_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/tags","blobs_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/git/refs{/sha}","trees_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/git/trees{/sha}","statuses_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/statuses/{sha}","languages_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/languages","stargazers_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/stargazers","contributors_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/contributors","subscribers_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/subscribers","subscription_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/subscription","commits_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/commits{/sha}","git_commits_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/git/commits{/sha}","comments_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/comments{/number}","issue_comment_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/issues/comments{/number}","contents_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/contents/{+path}","compare_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/compare/{base}...{head}","merges_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/merges","archive_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/downloads","issues_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/issues{/number}","pulls_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/pulls{/number}","milestones_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/milestones{/number}","notifications_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/labels{/name}","releases_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/releases{/id}","deployments_url":"https://api.github.com/repos/xwp/wp-customize-snapshots/deployments","created_at":"2015-11-04T23:42:20Z","updated_at":"2017-12-07T16:27:00Z","pushed_at":"2017-12-08T06:58:59Z","git_url":"git://github.com/xwp/wp-customize-snapshots.git","ssh_url":"git@github.com:xwp/wp-customize-snapshots.git","clone_url":"https://github.com/xwp/wp-customize-snapshots.git","svn_url":"https://github.com/xwp/wp-customize-snapshots","homepage":"https://wordpress.org/plugins/customize-snapshots/","size":3109,"stargazers_count":42,"watchers_count":42,"language":"PHP","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":8,"mirror_url":null,"archived":false,"open_issues_count":24,"license":null,"forks":8,"open_issues":24,"watchers":42,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/xwp/wp-customize-snapshots/pulls/71"},"html":{"href":"https://github.com/xwp/wp-customize-snapshots/pull/71"},"issue":{"href":"https://api.github.com/repos/xwp/wp-customize-snapshots/issues/71"},"comments":{"href":"https://api.github.com/repos/xwp/wp-customize-snapshots/issues/71/comments"},"review_comments":{"href":"https://api.github.com/repos/xwp/wp-customize-snapshots/pulls/71/comments"},"review_comment":{"href":"https://api.github.com/repos/xwp/wp-customize-snapshots/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/xwp/wp-customize-snapshots/pulls/71/commits"},"statuses":{"href":"https://api.github.com/repos/xwp/wp-customize-snapshots/statuses/093dfc8c3146962489acab8695cc1a6f4112bbb9"}},"author_association":"MEMBER"}}
{"actor":{"display_login":"westonruter"}}