Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle head sha changes correctly #77

Closed
wilzbach opened this issue Jun 16, 2017 · 2 comments · Fixed by #173
Closed

Handle head sha changes correctly #77

wilzbach opened this issue Jun 16, 2017 · 2 comments · Fixed by #173

Comments

@wilzbach
Copy link
Member

It seems like we always try to merge with an old sha?

Response if sha was provided and pull request head did not match

Status: 409 Conflict
{
  "message": "Head branch was modified. Review and try the merge again.",
  "documentation_url": "https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button"
}

See also: dlang/phobos#5466 (comment)

@wilzbach
Copy link
Member Author

wilzbach commented Jul 17, 2017

Appeared here again: dlang/dmd#6760 (comment)

Not sure what's exactly causing this to appear only on a few PRs.

@wilzbach
Copy link
Member Author

And here: dlang/dmd#7420

200 <190>1 2018-01-24T11:36:39.343284+00:00 app web.1 - - [048D4FF1:FD7CBDF0 ERR] PUT https://api.github.com/repos/dlang/dmd/pulls/7420/merge failed; Conflict 409.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants