Stream: committers/git-help
Topic: Pull succeeded but "merging is blocked"
Rik Smithies (Sep 20 2018 at 09:05):
First try at a commit etc.
Instructs say:
Once status checks have completed without errors, you will be able to merge your pull request into the master branch.
but:
https://github.com/HL7/fhir/pull/39
Merge branch 'master' of https://github.com/hl7/fhir
All checks have passed
1 successful check
FHIR Pull Request Status — #20180920.1 succeeded
Merging is blocked
The base branch restricts merging to authorized users. Learn more about protected branches.
Am I missing a permission? Wrong branch somehow? Is this something an admin does?
Same seems to apply to your last pull, number 38 @Claude Nanjo
Lloyd McKenzie (Sep 20 2018 at 14:40):
Your user id seems to be in the necessary group. @Josh Mandel ?
Bryn Rhodes (Sep 20 2018 at 14:42):
Only Josh and Grahame can merge at this time.
Lloyd McKenzie (Sep 20 2018 at 14:43):
I thought we were setting up auto-merge?
Josh Mandel (Sep 20 2018 at 14:45):
Wait, just catching up here. Everyone in the Committers list should be able to merge, one their PR is passing tests
Bryn Rhodes (Sep 20 2018 at 14:45):
When I go to the PR, it says I'm not authorized to merge because the master is protected.
Josh Mandel (Sep 20 2018 at 14:45):
The "mergify" tool to automatically merge it's something we are experimenting with. I'm looking for feedback from Grahame on whether it is working/useful.
Bryn Rhodes (Sep 20 2018 at 14:46):
That's why I haven't merged my PR yet, but I thought you knew that, so I was waiting for you to merge it :)
Josh Mandel (Sep 20 2018 at 14:46):
No I should not need to be involved.
Josh Mandel (Sep 20 2018 at 14:46):
Is it currently passing tests? And are you on the committers list?
Bryn Rhodes (Sep 20 2018 at 14:47):
Here's what I see: pasted image
Josh Mandel (Sep 20 2018 at 14:48):
Yikes, this is as "brynrhodes"?
Bryn Rhodes (Sep 20 2018 at 14:48):
Yes, and I just verified I'm a member of fhir-committers
Bryn Rhodes (Sep 20 2018 at 14:49):
But I think mergify is only set up for members of fhir-committers-mergify, of which I am not a member.
Bryn Rhodes (Sep 20 2018 at 14:49):
That's only you and Grahame, which is what prompted me to say that you two are the only ones that can merge at this time.
Josh Mandel (Sep 20 2018 at 14:50):
Ah, okay -- that's an unrelated issue. It's true we are the only ones who are configured to automatically merge.
Josh Mandel (Sep 20 2018 at 14:51):
I see the problem with the configuration now though.
Josh Mandel (Sep 20 2018 at 14:52):
When mergeify got configured, it removed the regular committers from the allowed list.
Josh Mandel (Sep 20 2018 at 14:52):
I just said it back; though it is possible that mergify is going to reset things again, in which case we will have to disable that app.
Josh Mandel (Sep 20 2018 at 14:52):
In the meantime, you should be able to merge :-)
Bryn Rhodes (Sep 20 2018 at 14:59):
Went to the page and even clicked refresh, still says I'm not authorized to merge :(
Josh Mandel (Sep 20 2018 at 14:59):
Thank you for the report! Checking..
Josh Mandel (Sep 20 2018 at 15:00):
Okay try one more time?
Bryn Rhodes (Sep 20 2018 at 15:02):
That worked! Thank you!
Josh Mandel (Sep 20 2018 at 15:03):
Sure. If anyone hits this issue again, please let me know and I will disable mergify so it doesn't clobber our settings.
Josh Mandel (Sep 20 2018 at 15:26):
Okay, just confirmed that mergify clobbers our Branch protection settings; I've disabled it
Grahame Grieve (Sep 20 2018 at 20:53):
well, that's pretty stupid on the part of mergify....
Grahame Grieve (Sep 20 2018 at 20:53):
I quite liked mergify as a tool for getting me more sleep
Josh Mandel (Sep 20 2018 at 21:07):
I'm talking to the developer.
Josh Mandel (Sep 21 2018 at 15:35):
https://github.com/Mergifyio/mergify-engine/issues/194#issuecomment-423433372 -- the answer is kinda "Coming in v2" :/
Grahame Grieve (Sep 21 2018 at 21:53):
is there a timeline for that?
Last updated: Apr 12 2022 at 19:14 UTC
