{"action":"closed","number":949,"pull_request":{"url":"https://api.github.com/repos/OpenTreeOfLife/opentree/pulls/949","id":64863840,"html_url":"https://github.com/OpenTreeOfLife/opentree/pull/949","diff_url":"https://github.com/OpenTreeOfLife/opentree/pull/949.diff","patch_url":"https://github.com/OpenTreeOfLife/opentree/pull/949.patch","issue_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/issues/949","number":949,"state":"closed","locked":false,"title":"Disambiguate two types of \"conflict\"","user":{"login":"jimallman","id":446375,"avatar_url":"https://avatars.githubusercontent.com/u/446375?v=3","gravatar_id":"","url":"https://api.github.com/users/jimallman","html_url":"https://github.com/jimallman","followers_url":"https://api.github.com/users/jimallman/followers","following_url":"https://api.github.com/users/jimallman/following{/other_user}","gists_url":"https://api.github.com/users/jimallman/gists{/gist_id}","starred_url":"https://api.github.com/users/jimallman/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jimallman/subscriptions","organizations_url":"https://api.github.com/users/jimallman/orgs","repos_url":"https://api.github.com/users/jimallman/repos","events_url":"https://api.github.com/users/jimallman/events{/privacy}","received_events_url":"https://api.github.com/users/jimallman/received_events","type":"User","site_admin":false},"body":"These changes rename \"conflicting node mappings\" as \"duplicate node mappings\", to avoid confusion with conflict-status reports resulting from tree comparison.\r\n\r\nThese changes are already merged into the current devtree branch (`apache-mods-for-v3` versus the usual `development`) and are available for review on **devtree**. Here's [a study with numerous duplicate mappings](http://devtree.opentreeoflife.org/curator/study/view/tt_103/?tab=trees) that can be used to show and test these changes.","created_at":"2016-03-31T21:41:58Z","updated_at":"2016-04-06T14:30:16Z","closed_at":"2016-04-06T14:30:16Z","merged_at":"2016-04-06T14:30:16Z","merge_commit_sha":"b28a8aa1427507cfc3021c891643b6f3b9373aec","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/pulls/949/commits","review_comments_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/pulls/949/comments","review_comment_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/pulls/comments{/number}","comments_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/issues/949/comments","statuses_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/statuses/b28a8aa1427507cfc3021c891643b6f3b9373aec","head":{"label":"OpenTreeOfLife:two-types-of-conflict","ref":"two-types-of-conflict","sha":"b28a8aa1427507cfc3021c891643b6f3b9373aec","user":{"login":"OpenTreeOfLife","id":1752618,"avatar_url":"https://avatars.githubusercontent.com/u/1752618?v=3","gravatar_id":"","url":"https://api.github.com/users/OpenTreeOfLife","html_url":"https://github.com/OpenTreeOfLife","followers_url":"https://api.github.com/users/OpenTreeOfLife/followers","following_url":"https://api.github.com/users/OpenTreeOfLife/following{/other_user}","gists_url":"https://api.github.com/users/OpenTreeOfLife/gists{/gist_id}","starred_url":"https://api.github.com/users/OpenTreeOfLife/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/OpenTreeOfLife/subscriptions","organizations_url":"https://api.github.com/users/OpenTreeOfLife/orgs","repos_url":"https://api.github.com/users/OpenTreeOfLife/repos","events_url":"https://api.github.com/users/OpenTreeOfLife/events{/privacy}","received_events_url":"https://api.github.com/users/OpenTreeOfLife/received_events","type":"Organization","site_admin":false},"repo":{"id":8276387,"name":"opentree","full_name":"OpenTreeOfLife/opentree","owner":{"login":"OpenTreeOfLife","id":1752618,"avatar_url":"https://avatars.githubusercontent.com/u/1752618?v=3","gravatar_id":"","url":"https://api.github.com/users/OpenTreeOfLife","html_url":"https://github.com/OpenTreeOfLife","followers_url":"https://api.github.com/users/OpenTreeOfLife/followers","following_url":"https://api.github.com/users/OpenTreeOfLife/following{/other_user}","gists_url":"https://api.github.com/users/OpenTreeOfLife/gists{/gist_id}","starred_url":"https://api.github.com/users/OpenTreeOfLife/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/OpenTreeOfLife/subscriptions","organizations_url":"https://api.github.com/users/OpenTreeOfLife/orgs","repos_url":"https://api.github.com/users/OpenTreeOfLife/repos","events_url":"https://api.github.com/users/OpenTreeOfLife/events{/privacy}","received_events_url":"https://api.github.com/users/OpenTreeOfLife/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/OpenTreeOfLife/opentree","description":"Opentree browsing and curation web site.  For overarching or cross-repo concerns, please see the 'germinator' repo.","fork":false,"url":"https://api.github.com/repos/OpenTreeOfLife/opentree","forks_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/forks","keys_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/keys{/key_id}","collaborators_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/teams","hooks_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/hooks","issue_events_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/issues/events{/number}","events_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/events","assignees_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/assignees{/user}","branches_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/branches{/branch}","tags_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/tags","blobs_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/git/refs{/sha}","trees_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/git/trees{/sha}","statuses_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/statuses/{sha}","languages_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/languages","stargazers_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/stargazers","contributors_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/contributors","subscribers_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/subscribers","subscription_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/subscription","commits_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/commits{/sha}","git_commits_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/git/commits{/sha}","comments_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/comments{/number}","issue_comment_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/issues/comments{/number}","contents_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/contents/{+path}","compare_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/compare/{base}...{head}","merges_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/merges","archive_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/downloads","issues_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/issues{/number}","pulls_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/pulls{/number}","milestones_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/milestones{/number}","notifications_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/labels{/name}","releases_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/releases{/id}","deployments_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/deployments","created_at":"2013-02-18T20:17:46Z","updated_at":"2016-04-04T03:57:20Z","pushed_at":"2016-04-06T14:30:15Z","git_url":"git://github.com/OpenTreeOfLife/opentree.git","ssh_url":"git@github.com:OpenTreeOfLife/opentree.git","clone_url":"https://github.com/OpenTreeOfLife/opentree.git","svn_url":"https://github.com/OpenTreeOfLife/opentree","homepage":"http://tree.opentreeoflife.org/","size":14505,"stargazers_count":69,"watchers_count":69,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":10,"mirror_url":null,"open_issues_count":237,"forks":10,"open_issues":237,"watchers":69,"default_branch":"master"}},"base":{"label":"OpenTreeOfLife:master","ref":"master","sha":"728d2716e2755c558e943a22931c43c2f1abf8d9","user":{"login":"OpenTreeOfLife","id":1752618,"avatar_url":"https://avatars.githubusercontent.com/u/1752618?v=3","gravatar_id":"","url":"https://api.github.com/users/OpenTreeOfLife","html_url":"https://github.com/OpenTreeOfLife","followers_url":"https://api.github.com/users/OpenTreeOfLife/followers","following_url":"https://api.github.com/users/OpenTreeOfLife/following{/other_user}","gists_url":"https://api.github.com/users/OpenTreeOfLife/gists{/gist_id}","starred_url":"https://api.github.com/users/OpenTreeOfLife/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/OpenTreeOfLife/subscriptions","organizations_url":"https://api.github.com/users/OpenTreeOfLife/orgs","repos_url":"https://api.github.com/users/OpenTreeOfLife/repos","events_url":"https://api.github.com/users/OpenTreeOfLife/events{/privacy}","received_events_url":"https://api.github.com/users/OpenTreeOfLife/received_events","type":"Organization","site_admin":false},"repo":{"id":8276387,"name":"opentree","full_name":"OpenTreeOfLife/opentree","owner":{"login":"OpenTreeOfLife","id":1752618,"avatar_url":"https://avatars.githubusercontent.com/u/1752618?v=3","gravatar_id":"","url":"https://api.github.com/users/OpenTreeOfLife","html_url":"https://github.com/OpenTreeOfLife","followers_url":"https://api.github.com/users/OpenTreeOfLife/followers","following_url":"https://api.github.com/users/OpenTreeOfLife/following{/other_user}","gists_url":"https://api.github.com/users/OpenTreeOfLife/gists{/gist_id}","starred_url":"https://api.github.com/users/OpenTreeOfLife/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/OpenTreeOfLife/subscriptions","organizations_url":"https://api.github.com/users/OpenTreeOfLife/orgs","repos_url":"https://api.github.com/users/OpenTreeOfLife/repos","events_url":"https://api.github.com/users/OpenTreeOfLife/events{/privacy}","received_events_url":"https://api.github.com/users/OpenTreeOfLife/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/OpenTreeOfLife/opentree","description":"Opentree browsing and curation web site.  For overarching or cross-repo concerns, please see the 'germinator' repo.","fork":false,"url":"https://api.github.com/repos/OpenTreeOfLife/opentree","forks_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/forks","keys_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/keys{/key_id}","collaborators_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/teams","hooks_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/hooks","issue_events_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/issues/events{/number}","events_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/events","assignees_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/assignees{/user}","branches_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/branches{/branch}","tags_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/tags","blobs_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/git/refs{/sha}","trees_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/git/trees{/sha}","statuses_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/statuses/{sha}","languages_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/languages","stargazers_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/stargazers","contributors_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/contributors","subscribers_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/subscribers","subscription_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/subscription","commits_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/commits{/sha}","git_commits_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/git/commits{/sha}","comments_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/comments{/number}","issue_comment_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/issues/comments{/number}","contents_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/contents/{+path}","compare_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/compare/{base}...{head}","merges_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/merges","archive_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/downloads","issues_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/issues{/number}","pulls_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/pulls{/number}","milestones_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/milestones{/number}","notifications_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/labels{/name}","releases_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/releases{/id}","deployments_url":"https://api.github.com/repos/OpenTreeOfLife/opentree/deployments","created_at":"2013-02-18T20:17:46Z","updated_at":"2016-04-04T03:57:20Z","pushed_at":"2016-04-06T14:30:15Z","git_url":"git://github.com/OpenTreeOfLife/opentree.git","ssh_url":"git@github.com:OpenTreeOfLife/opentree.git","clone_url":"https://github.com/OpenTreeOfLife/opentree.git","svn_url":"https://github.com/OpenTreeOfLife/opentree","homepage":"http://tree.opentreeoflife.org/","size":14505,"stargazers_count":69,"watchers_count":69,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":10,"mirror_url":null,"open_issues_count":237,"forks":10,"open_issues":237,"watchers":69,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/OpenTreeOfLife/opentree/pulls/949"},"html":{"href":"https://github.com/OpenTreeOfLife/opentree/pull/949"},"issue":{"href":"https://api.github.com/repos/OpenTreeOfLife/opentree/issues/949"},"comments":{"href":"https://api.github.com/repos/OpenTreeOfLife/opentree/issues/949/comments"},"review_comments":{"href":"https://api.github.com/repos/OpenTreeOfLife/opentree/pulls/949/comments"},"review_comment":{"href":"https://api.github.com/repos/OpenTreeOfLife/opentree/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/OpenTreeOfLife/opentree/pulls/949/commits"},"statuses":{"href":"https://api.github.com/repos/OpenTreeOfLife/opentree/statuses/b28a8aa1427507cfc3021c891643b6f3b9373aec"}},"merged":true,"mergeable":null,"mergeable_state":"unknown","merged_by":{"login":"kcranston","id":312034,"avatar_url":"https://avatars.githubusercontent.com/u/312034?v=3","gravatar_id":"","url":"https://api.github.com/users/kcranston","html_url":"https://github.com/kcranston","followers_url":"https://api.github.com/users/kcranston/followers","following_url":"https://api.github.com/users/kcranston/following{/other_user}","gists_url":"https://api.github.com/users/kcranston/gists{/gist_id}","starred_url":"https://api.github.com/users/kcranston/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kcranston/subscriptions","organizations_url":"https://api.github.com/users/kcranston/orgs","repos_url":"https://api.github.com/users/kcranston/repos","events_url":"https://api.github.com/users/kcranston/events{/privacy}","received_events_url":"https://api.github.com/users/kcranston/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"commits":6,"additions":114,"deletions":117,"changed_files":3}}