Hey Graphite team! We’re having a few issues with being able to merge PRs via the merge queue. We are getting this error repeatedly -

The Graphite merge queue couldn't merge this PR because it failed for an unknown reason (Unable to fast-forward merge trunk. To fix this, ensure that graphite-app is allowed to bypass required pull requests in your GitHub branch protection settings and/or rulesets.).

We do have the app added to the bypass PR in the branch protection. We initially thought it might be to do with the fact that someone did a merge commit from github directly. But after doing rebases after this and syncing, and then trying to merge again via the queue, it is still having this issue. Can you see anything else your side that could help?

(If applicable) To help us more clearly understand what you're trying to do, please provide additional details about: - Screenshots / debug logs / list of commands you've tried to run so far - Your workflow - Current state

Hey Brett - thanks for getting back to me. Here you go - we’re using standard branch protection rules

Thanks George, can you also just sanity check that there are no org level rulesets at play? also can you share a repo / pr num for one you hit this on?

Yeah no org based ones either! tenancy/2259/Add-a-guard-on-fetching-based-on-the-payment-intent

interesting i see a second error in my logs for that one that i havent seen before and need to do some more digging on:

Required status checks "ci/circleci: build", "ci/circleci: checkout", "ci/circleci: test-e2e", and "ci/circleci: test-unit" were not set by the expected GitHub apps. - <https://docs.github.com/articles/about-protected-branches>

Hey Brett - any thoughts on this?

Good Morning George, we absolutely support required checks with merge queue. Im not sure its related to the FF aspect to be honest. The error seems to be calling out a problem with the required checks themselves. See githubs mention of this and below what google seems to thing this issue is. Can you check on this?

Hi Brett - thanks for getting back to me. The required checks function correctly on Github when merging - I can merge there if they are turned on. The issue only appears when trying to do the fast forward that you do with the merge queue I think. The names of the ci jobs have not changed. From the previous message, did you look into the error further that you mentioned?

i have looked into it, and you are the only org hitting this. Im not seeing any further info on why this is happening.

The issue only appears when trying to do the fast forward that you do with the merge queue I think

Does this mean that the regular stack merge (ie no MQ) works for you in graphite?

I’ll quickly test this and get back to you - thanks for the support!

Okay so it does seem correlated to the fast forward merge huh. Im sorry i dont have a better answer here, it doesnt seem like whatever is blocking this is visible to us

I think I have fixed this now - looks like it is related to our circle CI integration having an older legacy app which was interfering with the new Github app we use (There were identical named checks and you can’t tell which ones are for what app in the UI on Github). To get around it, I added github checks and used those as the required checks on the branch protection. Bit of a weird one - thanks for your help!