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

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

Open
adampingel opened this issue Aug 26, 2024 · 6 comments
Assignees
Milestone

Comments

@adampingel
Copy link
Contributor

No description provided.

@adampingel adampingel converted this from a draft issue Aug 26, 2024
@adampingel adampingel added this to the 2024-10-21 milestone Aug 26, 2024
@rawkintrevo
Copy link

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

@rawkintrevo rawkintrevo self-assigned this Aug 28, 2024
@adampingel
Copy link
Contributor Author

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
Copy link

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

@adampingel
Copy link
Contributor Author

I though you were... doublechecking

@rawkintrevo
Copy link

@adampingel adampingel moved this from In Next Milestone to In Current Milestone in Granite Cookbooks Sep 6, 2024
@rawkintrevo
Copy link

@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

@rawkintrevo rawkintrevo moved this from In Current Milestone to In Review in Granite Cookbooks Sep 10, 2024
@adampingel adampingel assigned adampingel and unassigned rawkintrevo Oct 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Backlog
Development

No branches or pull requests

2 participants