{"action":"opened","number":2025,"pull_request":{"url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/pulls/2025","id":64664914,"html_url":"https://github.com/SalesforceFoundation/Cumulus/pull/2025","diff_url":"https://github.com/SalesforceFoundation/Cumulus/pull/2025.diff","patch_url":"https://github.com/SalesforceFoundation/Cumulus/pull/2025.patch","issue_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/issues/2025","number":2025,"state":"open","locked":false,"title":"Merge conflict merging dev into feature/lex-manage-household","user":{"login":"mrbelvedere","id":5545431,"avatar_url":"https://avatars.githubusercontent.com/u/5545431?v=3","gravatar_id":"","url":"https://api.github.com/users/mrbelvedere","html_url":"https://github.com/mrbelvedere","followers_url":"https://api.github.com/users/mrbelvedere/followers","following_url":"https://api.github.com/users/mrbelvedere/following{/other_user}","gists_url":"https://api.github.com/users/mrbelvedere/gists{/gist_id}","starred_url":"https://api.github.com/users/mrbelvedere/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mrbelvedere/subscriptions","organizations_url":"https://api.github.com/users/mrbelvedere/orgs","repos_url":"https://api.github.com/users/mrbelvedere/repos","events_url":"https://api.github.com/users/mrbelvedere/events{/privacy}","received_events_url":"https://api.github.com/users/mrbelvedere/received_events","type":"User","site_admin":false},"body":"mrbelvedere tried to merge new commits to dev but hit a merge conflict.  Please resolve manually","created_at":"2016-03-30T17:23:29Z","updated_at":"2016-03-30T17:23:29Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/pulls/2025/commits","review_comments_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/pulls/2025/comments","review_comment_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/pulls/comments{/number}","comments_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/issues/2025/comments","statuses_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/statuses/0b5377172254bda38dd1855cbe900af728514542","head":{"label":"SalesforceFoundation:dev","ref":"dev","sha":"0b5377172254bda38dd1855cbe900af728514542","user":{"login":"SalesforceFoundation","id":972305,"avatar_url":"https://avatars.githubusercontent.com/u/972305?v=3","gravatar_id":"","url":"https://api.github.com/users/SalesforceFoundation","html_url":"https://github.com/SalesforceFoundation","followers_url":"https://api.github.com/users/SalesforceFoundation/followers","following_url":"https://api.github.com/users/SalesforceFoundation/following{/other_user}","gists_url":"https://api.github.com/users/SalesforceFoundation/gists{/gist_id}","starred_url":"https://api.github.com/users/SalesforceFoundation/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/SalesforceFoundation/subscriptions","organizations_url":"https://api.github.com/users/SalesforceFoundation/orgs","repos_url":"https://api.github.com/users/SalesforceFoundation/repos","events_url":"https://api.github.com/users/SalesforceFoundation/events{/privacy}","received_events_url":"https://api.github.com/users/SalesforceFoundation/received_events","type":"Organization","site_admin":false},"repo":{"id":13108586,"name":"Cumulus","full_name":"SalesforceFoundation/Cumulus","owner":{"login":"SalesforceFoundation","id":972305,"avatar_url":"https://avatars.githubusercontent.com/u/972305?v=3","gravatar_id":"","url":"https://api.github.com/users/SalesforceFoundation","html_url":"https://github.com/SalesforceFoundation","followers_url":"https://api.github.com/users/SalesforceFoundation/followers","following_url":"https://api.github.com/users/SalesforceFoundation/following{/other_user}","gists_url":"https://api.github.com/users/SalesforceFoundation/gists{/gist_id}","starred_url":"https://api.github.com/users/SalesforceFoundation/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/SalesforceFoundation/subscriptions","organizations_url":"https://api.github.com/users/SalesforceFoundation/orgs","repos_url":"https://api.github.com/users/SalesforceFoundation/repos","events_url":"https://api.github.com/users/SalesforceFoundation/events{/privacy}","received_events_url":"https://api.github.com/users/SalesforceFoundation/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/SalesforceFoundation/Cumulus","description":"The current version of the Salesforce.org Nonprofit Starter Pack","fork":false,"url":"https://api.github.com/repos/SalesforceFoundation/Cumulus","forks_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/forks","keys_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/keys{/key_id}","collaborators_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/teams","hooks_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/hooks","issue_events_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/issues/events{/number}","events_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/events","assignees_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/assignees{/user}","branches_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/branches{/branch}","tags_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/tags","blobs_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/git/refs{/sha}","trees_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/git/trees{/sha}","statuses_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/statuses/{sha}","languages_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/languages","stargazers_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/stargazers","contributors_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/contributors","subscribers_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/subscribers","subscription_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/subscription","commits_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/commits{/sha}","git_commits_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/git/commits{/sha}","comments_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/comments{/number}","issue_comment_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/issues/comments{/number}","contents_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/contents/{+path}","compare_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/compare/{base}...{head}","merges_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/merges","archive_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/downloads","issues_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/issues{/number}","pulls_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/pulls{/number}","milestones_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/milestones{/number}","notifications_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/labels{/name}","releases_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/releases{/id}","deployments_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/deployments","created_at":"2013-09-25T23:56:49Z","updated_at":"2016-03-19T10:47:43Z","pushed_at":"2016-03-30T17:23:28Z","git_url":"git://github.com/SalesforceFoundation/Cumulus.git","ssh_url":"git@github.com:SalesforceFoundation/Cumulus.git","clone_url":"https://github.com/SalesforceFoundation/Cumulus.git","svn_url":"https://github.com/SalesforceFoundation/Cumulus","homepage":"http://www.salesforce.org/help/nonprofitstarterpack","size":54334,"stargazers_count":103,"watchers_count":103,"language":"Apex","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":101,"mirror_url":null,"open_issues_count":251,"forks":101,"open_issues":251,"watchers":103,"default_branch":"dev"}},"base":{"label":"SalesforceFoundation:feature/lex-manage-household","ref":"feature/lex-manage-household","sha":"3b5b93262eeb43c63c3bbffd446ff422f184347a","user":{"login":"SalesforceFoundation","id":972305,"avatar_url":"https://avatars.githubusercontent.com/u/972305?v=3","gravatar_id":"","url":"https://api.github.com/users/SalesforceFoundation","html_url":"https://github.com/SalesforceFoundation","followers_url":"https://api.github.com/users/SalesforceFoundation/followers","following_url":"https://api.github.com/users/SalesforceFoundation/following{/other_user}","gists_url":"https://api.github.com/users/SalesforceFoundation/gists{/gist_id}","starred_url":"https://api.github.com/users/SalesforceFoundation/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/SalesforceFoundation/subscriptions","organizations_url":"https://api.github.com/users/SalesforceFoundation/orgs","repos_url":"https://api.github.com/users/SalesforceFoundation/repos","events_url":"https://api.github.com/users/SalesforceFoundation/events{/privacy}","received_events_url":"https://api.github.com/users/SalesforceFoundation/received_events","type":"Organization","site_admin":false},"repo":{"id":13108586,"name":"Cumulus","full_name":"SalesforceFoundation/Cumulus","owner":{"login":"SalesforceFoundation","id":972305,"avatar_url":"https://avatars.githubusercontent.com/u/972305?v=3","gravatar_id":"","url":"https://api.github.com/users/SalesforceFoundation","html_url":"https://github.com/SalesforceFoundation","followers_url":"https://api.github.com/users/SalesforceFoundation/followers","following_url":"https://api.github.com/users/SalesforceFoundation/following{/other_user}","gists_url":"https://api.github.com/users/SalesforceFoundation/gists{/gist_id}","starred_url":"https://api.github.com/users/SalesforceFoundation/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/SalesforceFoundation/subscriptions","organizations_url":"https://api.github.com/users/SalesforceFoundation/orgs","repos_url":"https://api.github.com/users/SalesforceFoundation/repos","events_url":"https://api.github.com/users/SalesforceFoundation/events{/privacy}","received_events_url":"https://api.github.com/users/SalesforceFoundation/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/SalesforceFoundation/Cumulus","description":"The current version of the Salesforce.org Nonprofit Starter Pack","fork":false,"url":"https://api.github.com/repos/SalesforceFoundation/Cumulus","forks_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/forks","keys_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/keys{/key_id}","collaborators_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/teams","hooks_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/hooks","issue_events_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/issues/events{/number}","events_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/events","assignees_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/assignees{/user}","branches_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/branches{/branch}","tags_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/tags","blobs_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/git/refs{/sha}","trees_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/git/trees{/sha}","statuses_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/statuses/{sha}","languages_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/languages","stargazers_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/stargazers","contributors_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/contributors","subscribers_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/subscribers","subscription_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/subscription","commits_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/commits{/sha}","git_commits_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/git/commits{/sha}","comments_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/comments{/number}","issue_comment_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/issues/comments{/number}","contents_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/contents/{+path}","compare_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/compare/{base}...{head}","merges_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/merges","archive_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/downloads","issues_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/issues{/number}","pulls_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/pulls{/number}","milestones_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/milestones{/number}","notifications_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/labels{/name}","releases_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/releases{/id}","deployments_url":"https://api.github.com/repos/SalesforceFoundation/Cumulus/deployments","created_at":"2013-09-25T23:56:49Z","updated_at":"2016-03-19T10:47:43Z","pushed_at":"2016-03-30T17:23:28Z","git_url":"git://github.com/SalesforceFoundation/Cumulus.git","ssh_url":"git@github.com:SalesforceFoundation/Cumulus.git","clone_url":"https://github.com/SalesforceFoundation/Cumulus.git","svn_url":"https://github.com/SalesforceFoundation/Cumulus","homepage":"http://www.salesforce.org/help/nonprofitstarterpack","size":54334,"stargazers_count":103,"watchers_count":103,"language":"Apex","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":101,"mirror_url":null,"open_issues_count":251,"forks":101,"open_issues":251,"watchers":103,"default_branch":"dev"}},"_links":{"self":{"href":"https://api.github.com/repos/SalesforceFoundation/Cumulus/pulls/2025"},"html":{"href":"https://github.com/SalesforceFoundation/Cumulus/pull/2025"},"issue":{"href":"https://api.github.com/repos/SalesforceFoundation/Cumulus/issues/2025"},"comments":{"href":"https://api.github.com/repos/SalesforceFoundation/Cumulus/issues/2025/comments"},"review_comments":{"href":"https://api.github.com/repos/SalesforceFoundation/Cumulus/pulls/2025/comments"},"review_comment":{"href":"https://api.github.com/repos/SalesforceFoundation/Cumulus/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/SalesforceFoundation/Cumulus/pulls/2025/commits"},"statuses":{"href":"https://api.github.com/repos/SalesforceFoundation/Cumulus/statuses/0b5377172254bda38dd1855cbe900af728514542"}},"merged":false,"mergeable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"commits":14,"additions":306,"deletions":300,"changed_files":322}}