{"action":"opened","number":50,"pull_request":{"url":"https://api.github.com/repos/hydro-automerge/private/pulls/50","id":178130329,"html_url":"https://github.com/hydro-automerge/private/pull/50","diff_url":"https://github.com/hydro-automerge/private/pull/50.diff","patch_url":"https://github.com/hydro-automerge/private/pull/50.patch","issue_url":"https://api.github.com/repos/hydro-automerge/private/issues/50","number":50,"state":"open","locked":false,"title":"Multiple commits and conflict","user":{"login":"hydro-automerge","id":37596434,"avatar_url":"https://avatars2.githubusercontent.com/u/37596434?v=4","gravatar_id":"","url":"https://api.github.com/users/hydro-automerge","html_url":"https://github.com/hydro-automerge","followers_url":"https://api.github.com/users/hydro-automerge/followers","following_url":"https://api.github.com/users/hydro-automerge/following{/other_user}","gists_url":"https://api.github.com/users/hydro-automerge/gists{/gist_id}","starred_url":"https://api.github.com/users/hydro-automerge/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/hydro-automerge/subscriptions","organizations_url":"https://api.github.com/users/hydro-automerge/orgs","repos_url":"https://api.github.com/users/hydro-automerge/repos","events_url":"https://api.github.com/users/hydro-automerge/events{/privacy}","received_events_url":"https://api.github.com/users/hydro-automerge/received_events","type":"User","site_admin":false},"body":"This test creates a pull request with multiple commits in its branch history. An intervening commit on private makes the pull request unmergeable on private","created_at":"2018-03-28T18:52:23Z","updated_at":"2018-03-28T18:52:23Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/hydro-automerge/private/pulls/50/commits","review_comments_url":"https://api.github.com/repos/hydro-automerge/private/pulls/50/comments","review_comment_url":"https://api.github.com/repos/hydro-automerge/private/pulls/comments{/number}","comments_url":"https://api.github.com/repos/hydro-automerge/private/issues/50/comments","statuses_url":"https://api.github.com/repos/hydro-automerge/private/statuses/5b27854219fe0b43424b67705708d75613a9a0db","head":{"label":"hydro-automerge:pr-50-merge","ref":"pr-50-merge","sha":"5b27854219fe0b43424b67705708d75613a9a0db","user":{"login":"hydro-automerge","id":37596434,"avatar_url":"https://avatars2.githubusercontent.com/u/37596434?v=4","gravatar_id":"","url":"https://api.github.com/users/hydro-automerge","html_url":"https://github.com/hydro-automerge","followers_url":"https://api.github.com/users/hydro-automerge/followers","following_url":"https://api.github.com/users/hydro-automerge/following{/other_user}","gists_url":"https://api.github.com/users/hydro-automerge/gists{/gist_id}","starred_url":"https://api.github.com/users/hydro-automerge/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/hydro-automerge/subscriptions","organizations_url":"https://api.github.com/users/hydro-automerge/orgs","repos_url":"https://api.github.com/users/hydro-automerge/repos","events_url":"https://api.github.com/users/hydro-automerge/events{/privacy}","received_events_url":"https://api.github.com/users/hydro-automerge/received_events","type":"User","site_admin":false},"repo":{"id":126073854,"name":"private","full_name":"hydro-automerge/private","owner":{"login":"hydro-automerge","id":37596434,"avatar_url":"https://avatars2.githubusercontent.com/u/37596434?v=4","gravatar_id":"","url":"https://api.github.com/users/hydro-automerge","html_url":"https://github.com/hydro-automerge","followers_url":"https://api.github.com/users/hydro-automerge/followers","following_url":"https://api.github.com/users/hydro-automerge/following{/other_user}","gists_url":"https://api.github.com/users/hydro-automerge/gists{/gist_id}","starred_url":"https://api.github.com/users/hydro-automerge/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/hydro-automerge/subscriptions","organizations_url":"https://api.github.com/users/hydro-automerge/orgs","repos_url":"https://api.github.com/users/hydro-automerge/repos","events_url":"https://api.github.com/users/hydro-automerge/events{/privacy}","received_events_url":"https://api.github.com/users/hydro-automerge/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/hydro-automerge/private","description":null,"fork":true,"url":"https://api.github.com/repos/hydro-automerge/private","forks_url":"https://api.github.com/repos/hydro-automerge/private/forks","keys_url":"https://api.github.com/repos/hydro-automerge/private/keys{/key_id}","collaborators_url":"https://api.github.com/repos/hydro-automerge/private/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/hydro-automerge/private/teams","hooks_url":"https://api.github.com/repos/hydro-automerge/private/hooks","issue_events_url":"https://api.github.com/repos/hydro-automerge/private/issues/events{/number}","events_url":"https://api.github.com/repos/hydro-automerge/private/events","assignees_url":"https://api.github.com/repos/hydro-automerge/private/assignees{/user}","branches_url":"https://api.github.com/repos/hydro-automerge/private/branches{/branch}","tags_url":"https://api.github.com/repos/hydro-automerge/private/tags","blobs_url":"https://api.github.com/repos/hydro-automerge/private/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/hydro-automerge/private/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/hydro-automerge/private/git/refs{/sha}","trees_url":"https://api.github.com/repos/hydro-automerge/private/git/trees{/sha}","statuses_url":"https://api.github.com/repos/hydro-automerge/private/statuses/{sha}","languages_url":"https://api.github.com/repos/hydro-automerge/private/languages","stargazers_url":"https://api.github.com/repos/hydro-automerge/private/stargazers","contributors_url":"https://api.github.com/repos/hydro-automerge/private/contributors","subscribers_url":"https://api.github.com/repos/hydro-automerge/private/subscribers","subscription_url":"https://api.github.com/repos/hydro-automerge/private/subscription","commits_url":"https://api.github.com/repos/hydro-automerge/private/commits{/sha}","git_commits_url":"https://api.github.com/repos/hydro-automerge/private/git/commits{/sha}","comments_url":"https://api.github.com/repos/hydro-automerge/private/comments{/number}","issue_comment_url":"https://api.github.com/repos/hydro-automerge/private/issues/comments{/number}","contents_url":"https://api.github.com/repos/hydro-automerge/private/contents/{+path}","compare_url":"https://api.github.com/repos/hydro-automerge/private/compare/{base}...{head}","merges_url":"https://api.github.com/repos/hydro-automerge/private/merges","archive_url":"https://api.github.com/repos/hydro-automerge/private/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/hydro-automerge/private/downloads","issues_url":"https://api.github.com/repos/hydro-automerge/private/issues{/number}","pulls_url":"https://api.github.com/repos/hydro-automerge/private/pulls{/number}","milestones_url":"https://api.github.com/repos/hydro-automerge/private/milestones{/number}","notifications_url":"https://api.github.com/repos/hydro-automerge/private/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/hydro-automerge/private/labels{/name}","releases_url":"https://api.github.com/repos/hydro-automerge/private/releases{/id}","deployments_url":"https://api.github.com/repos/hydro-automerge/private/deployments","created_at":"2018-03-20T19:48:26Z","updated_at":"2018-03-28T18:52:18Z","pushed_at":"2018-03-28T18:52:23Z","git_url":"git://github.com/hydro-automerge/private.git","ssh_url":"git@github.com:hydro-automerge/private.git","clone_url":"https://github.com/hydro-automerge/private.git","svn_url":"https://github.com/hydro-automerge/private","homepage":null,"size":0,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":1,"license":null,"forks":0,"open_issues":1,"watchers":0,"default_branch":"master"}},"base":{"label":"hydro-automerge:master","ref":"master","sha":"15712b0e19e4aa633c788cd199dca26949c4cb2d","user":{"login":"hydro-automerge","id":37596434,"avatar_url":"https://avatars2.githubusercontent.com/u/37596434?v=4","gravatar_id":"","url":"https://api.github.com/users/hydro-automerge","html_url":"https://github.com/hydro-automerge","followers_url":"https://api.github.com/users/hydro-automerge/followers","following_url":"https://api.github.com/users/hydro-automerge/following{/other_user}","gists_url":"https://api.github.com/users/hydro-automerge/gists{/gist_id}","starred_url":"https://api.github.com/users/hydro-automerge/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/hydro-automerge/subscriptions","organizations_url":"https://api.github.com/users/hydro-automerge/orgs","repos_url":"https://api.github.com/users/hydro-automerge/repos","events_url":"https://api.github.com/users/hydro-automerge/events{/privacy}","received_events_url":"https://api.github.com/users/hydro-automerge/received_events","type":"User","site_admin":false},"repo":{"id":126073854,"name":"private","full_name":"hydro-automerge/private","owner":{"login":"hydro-automerge","id":37596434,"avatar_url":"https://avatars2.githubusercontent.com/u/37596434?v=4","gravatar_id":"","url":"https://api.github.com/users/hydro-automerge","html_url":"https://github.com/hydro-automerge","followers_url":"https://api.github.com/users/hydro-automerge/followers","following_url":"https://api.github.com/users/hydro-automerge/following{/other_user}","gists_url":"https://api.github.com/users/hydro-automerge/gists{/gist_id}","starred_url":"https://api.github.com/users/hydro-automerge/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/hydro-automerge/subscriptions","organizations_url":"https://api.github.com/users/hydro-automerge/orgs","repos_url":"https://api.github.com/users/hydro-automerge/repos","events_url":"https://api.github.com/users/hydro-automerge/events{/privacy}","received_events_url":"https://api.github.com/users/hydro-automerge/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/hydro-automerge/private","description":null,"fork":true,"url":"https://api.github.com/repos/hydro-automerge/private","forks_url":"https://api.github.com/repos/hydro-automerge/private/forks","keys_url":"https://api.github.com/repos/hydro-automerge/private/keys{/key_id}","collaborators_url":"https://api.github.com/repos/hydro-automerge/private/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/hydro-automerge/private/teams","hooks_url":"https://api.github.com/repos/hydro-automerge/private/hooks","issue_events_url":"https://api.github.com/repos/hydro-automerge/private/issues/events{/number}","events_url":"https://api.github.com/repos/hydro-automerge/private/events","assignees_url":"https://api.github.com/repos/hydro-automerge/private/assignees{/user}","branches_url":"https://api.github.com/repos/hydro-automerge/private/branches{/branch}","tags_url":"https://api.github.com/repos/hydro-automerge/private/tags","blobs_url":"https://api.github.com/repos/hydro-automerge/private/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/hydro-automerge/private/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/hydro-automerge/private/git/refs{/sha}","trees_url":"https://api.github.com/repos/hydro-automerge/private/git/trees{/sha}","statuses_url":"https://api.github.com/repos/hydro-automerge/private/statuses/{sha}","languages_url":"https://api.github.com/repos/hydro-automerge/private/languages","stargazers_url":"https://api.github.com/repos/hydro-automerge/private/stargazers","contributors_url":"https://api.github.com/repos/hydro-automerge/private/contributors","subscribers_url":"https://api.github.com/repos/hydro-automerge/private/subscribers","subscription_url":"https://api.github.com/repos/hydro-automerge/private/subscription","commits_url":"https://api.github.com/repos/hydro-automerge/private/commits{/sha}","git_commits_url":"https://api.github.com/repos/hydro-automerge/private/git/commits{/sha}","comments_url":"https://api.github.com/repos/hydro-automerge/private/comments{/number}","issue_comment_url":"https://api.github.com/repos/hydro-automerge/private/issues/comments{/number}","contents_url":"https://api.github.com/repos/hydro-automerge/private/contents/{+path}","compare_url":"https://api.github.com/repos/hydro-automerge/private/compare/{base}...{head}","merges_url":"https://api.github.com/repos/hydro-automerge/private/merges","archive_url":"https://api.github.com/repos/hydro-automerge/private/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/hydro-automerge/private/downloads","issues_url":"https://api.github.com/repos/hydro-automerge/private/issues{/number}","pulls_url":"https://api.github.com/repos/hydro-automerge/private/pulls{/number}","milestones_url":"https://api.github.com/repos/hydro-automerge/private/milestones{/number}","notifications_url":"https://api.github.com/repos/hydro-automerge/private/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/hydro-automerge/private/labels{/name}","releases_url":"https://api.github.com/repos/hydro-automerge/private/releases{/id}","deployments_url":"https://api.github.com/repos/hydro-automerge/private/deployments","created_at":"2018-03-20T19:48:26Z","updated_at":"2018-03-28T18:52:18Z","pushed_at":"2018-03-28T18:52:23Z","git_url":"git://github.com/hydro-automerge/private.git","ssh_url":"git@github.com:hydro-automerge/private.git","clone_url":"https://github.com/hydro-automerge/private.git","svn_url":"https://github.com/hydro-automerge/private","homepage":null,"size":0,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":1,"license":null,"forks":0,"open_issues":1,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/hydro-automerge/private/pulls/50"},"html":{"href":"https://github.com/hydro-automerge/private/pull/50"},"issue":{"href":"https://api.github.com/repos/hydro-automerge/private/issues/50"},"comments":{"href":"https://api.github.com/repos/hydro-automerge/private/issues/50/comments"},"review_comments":{"href":"https://api.github.com/repos/hydro-automerge/private/pulls/50/comments"},"review_comment":{"href":"https://api.github.com/repos/hydro-automerge/private/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/hydro-automerge/private/pulls/50/commits"},"statuses":{"href":"https://api.github.com/repos/hydro-automerge/private/statuses/5b27854219fe0b43424b67705708d75613a9a0db"}},"author_association":"OWNER","merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":4,"additions":5,"deletions":5,"changed_files":2}}
{"actor":{"display_login":"hydro-automerge"}}