find solution to blocked merges "The base branch does not allow updates."

[rawkintrevo]

The restrict updates rule is blocking https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/available-rules-for-rulesets#restrict-updates

So turn it off? https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/managing-a-branch-protection-rule

Explanation of the feature: https://coe.aboriginal-armadillo.com/share/gyyXK1eski3PdAGdrWmG

Third option- the current bypass list is only Admin, but we could/should expand it out to the entire team (I think we can do that for just the one rule, but leave the other rules (like DCO, must have a review, etc) to only be bypassed by admin

[adampingel]

Thanks for the links.

Right now we have "enforce" set for the "github recommended" rules. It's nice that our config is relatively "vanilla".

I think right now the list of admins is the set of people who should be able to update main. Maybe we leave this alone until those lists diverge.

[rawkintrevo]

Ok, can I be added to the list of admins then?

[adampingel]

I though you were... doublechecking

[rawkintrevo]

https://github.com/ibm-granite-community/granite-code-cookbook/settings/access it's just you and dean

[rawkintrevo]

@adampingel as i said before you need to unlock the branch https://github.com/orgs/community/discussions/65403#discussioncomment-7775476

note, unlocking it doesn't mean anyone in the world has write permissions[1]. it just means don't post that warning and require a bypass to merge something.

[1] Limit who has push access to the branch: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request