{"action":"closed","number":4,"pull_request":{"url":"https://api.github.com/repos/udcanvas/studygroup/pulls/4","id":49472698,"html_url":"https://github.com/udcanvas/studygroup/pull/4","diff_url":"https://github.com/udcanvas/studygroup/pull/4.diff","patch_url":"https://github.com/udcanvas/studygroup/pull/4.patch","issue_url":"https://api.github.com/repos/udcanvas/studygroup/issues/4","number":4,"state":"closed","locked":false,"title":"new test change from Becky","user":{"login":"bkinney","id":2465197,"avatar_url":"https://avatars.githubusercontent.com/u/2465197?v=3","gravatar_id":"","url":"https://api.github.com/users/bkinney","html_url":"https://github.com/bkinney","followers_url":"https://api.github.com/users/bkinney/followers","following_url":"https://api.github.com/users/bkinney/following{/other_user}","gists_url":"https://api.github.com/users/bkinney/gists{/gist_id}","starred_url":"https://api.github.com/users/bkinney/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/bkinney/subscriptions","organizations_url":"https://api.github.com/users/bkinney/orgs","repos_url":"https://api.github.com/users/bkinney/repos","events_url":"https://api.github.com/users/bkinney/events{/privacy}","received_events_url":"https://api.github.com/users/bkinney/received_events","type":"User","site_admin":false},"body":"So, I know this can't be merged, but I now have two active merge requests that conflict. Let's see what sorts of workflows are possible to resolve conflicts.","created_at":"2015-11-02T19:16:23Z","updated_at":"2015-11-02T19:43:38Z","closed_at":"2015-11-02T19:43:38Z","merged_at":"2015-11-02T19:43:38Z","merge_commit_sha":"de61523e560fd3150bb9c0d510d7488a6c0efed3","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/udcanvas/studygroup/pulls/4/commits","review_comments_url":"https://api.github.com/repos/udcanvas/studygroup/pulls/4/comments","review_comment_url":"https://api.github.com/repos/udcanvas/studygroup/pulls/comments{/number}","comments_url":"https://api.github.com/repos/udcanvas/studygroup/issues/4/comments","statuses_url":"https://api.github.com/repos/udcanvas/studygroup/statuses/5e3f470bbd59aee18ac98c89a5ae9141df610cfb","head":{"label":"udcanvas:becky","ref":"becky","sha":"5e3f470bbd59aee18ac98c89a5ae9141df610cfb","user":{"login":"udcanvas","id":13320872,"avatar_url":"https://avatars.githubusercontent.com/u/13320872?v=3","gravatar_id":"","url":"https://api.github.com/users/udcanvas","html_url":"https://github.com/udcanvas","followers_url":"https://api.github.com/users/udcanvas/followers","following_url":"https://api.github.com/users/udcanvas/following{/other_user}","gists_url":"https://api.github.com/users/udcanvas/gists{/gist_id}","starred_url":"https://api.github.com/users/udcanvas/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/udcanvas/subscriptions","organizations_url":"https://api.github.com/users/udcanvas/orgs","repos_url":"https://api.github.com/users/udcanvas/repos","events_url":"https://api.github.com/users/udcanvas/events{/privacy}","received_events_url":"https://api.github.com/users/udcanvas/received_events","type":"User","site_admin":false},"repo":{"id":45409338,"name":"studygroup","full_name":"udcanvas/studygroup","owner":{"login":"udcanvas","id":13320872,"avatar_url":"https://avatars.githubusercontent.com/u/13320872?v=3","gravatar_id":"","url":"https://api.github.com/users/udcanvas","html_url":"https://github.com/udcanvas","followers_url":"https://api.github.com/users/udcanvas/followers","following_url":"https://api.github.com/users/udcanvas/following{/other_user}","gists_url":"https://api.github.com/users/udcanvas/gists{/gist_id}","starred_url":"https://api.github.com/users/udcanvas/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/udcanvas/subscriptions","organizations_url":"https://api.github.com/users/udcanvas/orgs","repos_url":"https://api.github.com/users/udcanvas/repos","events_url":"https://api.github.com/users/udcanvas/events{/privacy}","received_events_url":"https://api.github.com/users/udcanvas/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/udcanvas/studygroup","description":"","fork":false,"url":"https://api.github.com/repos/udcanvas/studygroup","forks_url":"https://api.github.com/repos/udcanvas/studygroup/forks","keys_url":"https://api.github.com/repos/udcanvas/studygroup/keys{/key_id}","collaborators_url":"https://api.github.com/repos/udcanvas/studygroup/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/udcanvas/studygroup/teams","hooks_url":"https://api.github.com/repos/udcanvas/studygroup/hooks","issue_events_url":"https://api.github.com/repos/udcanvas/studygroup/issues/events{/number}","events_url":"https://api.github.com/repos/udcanvas/studygroup/events","assignees_url":"https://api.github.com/repos/udcanvas/studygroup/assignees{/user}","branches_url":"https://api.github.com/repos/udcanvas/studygroup/branches{/branch}","tags_url":"https://api.github.com/repos/udcanvas/studygroup/tags","blobs_url":"https://api.github.com/repos/udcanvas/studygroup/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/udcanvas/studygroup/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/udcanvas/studygroup/git/refs{/sha}","trees_url":"https://api.github.com/repos/udcanvas/studygroup/git/trees{/sha}","statuses_url":"https://api.github.com/repos/udcanvas/studygroup/statuses/{sha}","languages_url":"https://api.github.com/repos/udcanvas/studygroup/languages","stargazers_url":"https://api.github.com/repos/udcanvas/studygroup/stargazers","contributors_url":"https://api.github.com/repos/udcanvas/studygroup/contributors","subscribers_url":"https://api.github.com/repos/udcanvas/studygroup/subscribers","subscription_url":"https://api.github.com/repos/udcanvas/studygroup/subscription","commits_url":"https://api.github.com/repos/udcanvas/studygroup/commits{/sha}","git_commits_url":"https://api.github.com/repos/udcanvas/studygroup/git/commits{/sha}","comments_url":"https://api.github.com/repos/udcanvas/studygroup/comments{/number}","issue_comment_url":"https://api.github.com/repos/udcanvas/studygroup/issues/comments{/number}","contents_url":"https://api.github.com/repos/udcanvas/studygroup/contents/{+path}","compare_url":"https://api.github.com/repos/udcanvas/studygroup/compare/{base}...{head}","merges_url":"https://api.github.com/repos/udcanvas/studygroup/merges","archive_url":"https://api.github.com/repos/udcanvas/studygroup/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/udcanvas/studygroup/downloads","issues_url":"https://api.github.com/repos/udcanvas/studygroup/issues{/number}","pulls_url":"https://api.github.com/repos/udcanvas/studygroup/pulls{/number}","milestones_url":"https://api.github.com/repos/udcanvas/studygroup/milestones{/number}","notifications_url":"https://api.github.com/repos/udcanvas/studygroup/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/udcanvas/studygroup/labels{/name}","releases_url":"https://api.github.com/repos/udcanvas/studygroup/releases{/id}","created_at":"2015-11-02T17:10:59Z","updated_at":"2015-11-02T17:10:59Z","pushed_at":"2015-11-02T19:43:38Z","git_url":"git://github.com/udcanvas/studygroup.git","ssh_url":"git@github.com:udcanvas/studygroup.git","clone_url":"https://github.com/udcanvas/studygroup.git","svn_url":"https://github.com/udcanvas/studygroup","homepage":null,"size":0,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"udcanvas:master","ref":"master","sha":"59f0f9f2d0f53996008482baf5ce8bcb0d69f521","user":{"login":"udcanvas","id":13320872,"avatar_url":"https://avatars.githubusercontent.com/u/13320872?v=3","gravatar_id":"","url":"https://api.github.com/users/udcanvas","html_url":"https://github.com/udcanvas","followers_url":"https://api.github.com/users/udcanvas/followers","following_url":"https://api.github.com/users/udcanvas/following{/other_user}","gists_url":"https://api.github.com/users/udcanvas/gists{/gist_id}","starred_url":"https://api.github.com/users/udcanvas/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/udcanvas/subscriptions","organizations_url":"https://api.github.com/users/udcanvas/orgs","repos_url":"https://api.github.com/users/udcanvas/repos","events_url":"https://api.github.com/users/udcanvas/events{/privacy}","received_events_url":"https://api.github.com/users/udcanvas/received_events","type":"User","site_admin":false},"repo":{"id":45409338,"name":"studygroup","full_name":"udcanvas/studygroup","owner":{"login":"udcanvas","id":13320872,"avatar_url":"https://avatars.githubusercontent.com/u/13320872?v=3","gravatar_id":"","url":"https://api.github.com/users/udcanvas","html_url":"https://github.com/udcanvas","followers_url":"https://api.github.com/users/udcanvas/followers","following_url":"https://api.github.com/users/udcanvas/following{/other_user}","gists_url":"https://api.github.com/users/udcanvas/gists{/gist_id}","starred_url":"https://api.github.com/users/udcanvas/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/udcanvas/subscriptions","organizations_url":"https://api.github.com/users/udcanvas/orgs","repos_url":"https://api.github.com/users/udcanvas/repos","events_url":"https://api.github.com/users/udcanvas/events{/privacy}","received_events_url":"https://api.github.com/users/udcanvas/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/udcanvas/studygroup","description":"","fork":false,"url":"https://api.github.com/repos/udcanvas/studygroup","forks_url":"https://api.github.com/repos/udcanvas/studygroup/forks","keys_url":"https://api.github.com/repos/udcanvas/studygroup/keys{/key_id}","collaborators_url":"https://api.github.com/repos/udcanvas/studygroup/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/udcanvas/studygroup/teams","hooks_url":"https://api.github.com/repos/udcanvas/studygroup/hooks","issue_events_url":"https://api.github.com/repos/udcanvas/studygroup/issues/events{/number}","events_url":"https://api.github.com/repos/udcanvas/studygroup/events","assignees_url":"https://api.github.com/repos/udcanvas/studygroup/assignees{/user}","branches_url":"https://api.github.com/repos/udcanvas/studygroup/branches{/branch}","tags_url":"https://api.github.com/repos/udcanvas/studygroup/tags","blobs_url":"https://api.github.com/repos/udcanvas/studygroup/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/udcanvas/studygroup/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/udcanvas/studygroup/git/refs{/sha}","trees_url":"https://api.github.com/repos/udcanvas/studygroup/git/trees{/sha}","statuses_url":"https://api.github.com/repos/udcanvas/studygroup/statuses/{sha}","languages_url":"https://api.github.com/repos/udcanvas/studygroup/languages","stargazers_url":"https://api.github.com/repos/udcanvas/studygroup/stargazers","contributors_url":"https://api.github.com/repos/udcanvas/studygroup/contributors","subscribers_url":"https://api.github.com/repos/udcanvas/studygroup/subscribers","subscription_url":"https://api.github.com/repos/udcanvas/studygroup/subscription","commits_url":"https://api.github.com/repos/udcanvas/studygroup/commits{/sha}","git_commits_url":"https://api.github.com/repos/udcanvas/studygroup/git/commits{/sha}","comments_url":"https://api.github.com/repos/udcanvas/studygroup/comments{/number}","issue_comment_url":"https://api.github.com/repos/udcanvas/studygroup/issues/comments{/number}","contents_url":"https://api.github.com/repos/udcanvas/studygroup/contents/{+path}","compare_url":"https://api.github.com/repos/udcanvas/studygroup/compare/{base}...{head}","merges_url":"https://api.github.com/repos/udcanvas/studygroup/merges","archive_url":"https://api.github.com/repos/udcanvas/studygroup/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/udcanvas/studygroup/downloads","issues_url":"https://api.github.com/repos/udcanvas/studygroup/issues{/number}","pulls_url":"https://api.github.com/repos/udcanvas/studygroup/pulls{/number}","milestones_url":"https://api.github.com/repos/udcanvas/studygroup/milestones{/number}","notifications_url":"https://api.github.com/repos/udcanvas/studygroup/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/udcanvas/studygroup/labels{/name}","releases_url":"https://api.github.com/repos/udcanvas/studygroup/releases{/id}","created_at":"2015-11-02T17:10:59Z","updated_at":"2015-11-02T17:10:59Z","pushed_at":"2015-11-02T19:43:38Z","git_url":"git://github.com/udcanvas/studygroup.git","ssh_url":"git@github.com:udcanvas/studygroup.git","clone_url":"https://github.com/udcanvas/studygroup.git","svn_url":"https://github.com/udcanvas/studygroup","homepage":null,"size":0,"stargazers_count":0,"watchers_count":0,"language":null,"has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/udcanvas/studygroup/pulls/4"},"html":{"href":"https://github.com/udcanvas/studygroup/pull/4"},"issue":{"href":"https://api.github.com/repos/udcanvas/studygroup/issues/4"},"comments":{"href":"https://api.github.com/repos/udcanvas/studygroup/issues/4/comments"},"review_comments":{"href":"https://api.github.com/repos/udcanvas/studygroup/pulls/4/comments"},"review_comment":{"href":"https://api.github.com/repos/udcanvas/studygroup/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/udcanvas/studygroup/pulls/4/commits"},"statuses":{"href":"https://api.github.com/repos/udcanvas/studygroup/statuses/5e3f470bbd59aee18ac98c89a5ae9141df610cfb"}},"merged":true,"mergeable":null,"mergeable_state":"unknown","merged_by":{"login":"bkinney","id":2465197,"avatar_url":"https://avatars.githubusercontent.com/u/2465197?v=3","gravatar_id":"","url":"https://api.github.com/users/bkinney","html_url":"https://github.com/bkinney","followers_url":"https://api.github.com/users/bkinney/followers","following_url":"https://api.github.com/users/bkinney/following{/other_user}","gists_url":"https://api.github.com/users/bkinney/gists{/gist_id}","starred_url":"https://api.github.com/users/bkinney/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/bkinney/subscriptions","organizations_url":"https://api.github.com/users/bkinney/orgs","repos_url":"https://api.github.com/users/bkinney/repos","events_url":"https://api.github.com/users/bkinney/events{/privacy}","received_events_url":"https://api.github.com/users/bkinney/received_events","type":"User","site_admin":false},"comments":1,"review_comments":0,"commits":3,"additions":4,"deletions":1,"changed_files":1}}