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

Fix accident from https://github.com/projectmesa/mesa/pull/1488 #1489

Merged
merged 1 commit into from
Oct 30, 2022

Conversation

rht
Copy link
Contributor

@rht rht commented Oct 30, 2022

#1488 was accidentally merged, because I thought I was making a PR to github.com/rht/mesa. I was able to change the settings, and hence made me think that it was rht/mesa.

The correct step should be to not force-push the main branch (rewrite history).

@rht
Copy link
Contributor Author

rht commented Oct 30, 2022

We should enable GH config where a maintainer can't merge their own PR without an approval from the other maintainer: https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches#require-pull-request-reviews-before-merging.

@rht rht changed the title Fix accident from previous commit Fix accident from https://github.com/projectmesa/mesa/pull/1488 Oct 30, 2022
@tpike3 tpike3 merged commit 25fc611 into projectmesa:main Oct 30, 2022
@rht rht deleted the fix_readme branch October 30, 2022 13:31
@wang-boyu
Copy link
Member

Don't worry. Things like this always happen : )

As an alternative, shall we simply set the main branch as a protected branch, disallowing forced push? Not sure whether this was already done or not.

Ref: About protected branches

@rht
Copy link
Contributor Author

rht commented Oct 31, 2022

@jackiekazil ^ for disallowing force push to main branch for both Mesa and Mesa-Geo.

@tpike3
Copy link
Contributor

tpike3 commented Oct 31, 2022

@jackiekazil ^ for disallowing force push to main branch for both Mesa and Mesa-Geo.

@Corvince
Copy link
Contributor

Corvince commented Nov 1, 2022

I made main a protected branch on Mesa, but I don't have the same access rights on Mesa-geo, so...

@jackiekazil ^ for disallowing force push to main branch for Mesa-Geo.

@jackiekazil
Copy link
Member

jackiekazil commented Nov 1, 2022

@Corvince i made mesa-geo to match.
@tpike3 - can you add permissions discussion to next month's mesa discussion? We need to add some logic as to who can do these things and where? It is weird and inconsistent that @Corvince would be able to do it in one but not the other repo.

@jackiekazil jackiekazil added this to the v1.2.0 Taylor milestone Feb 27, 2023
@jackiekazil jackiekazil mentioned this pull request Mar 7, 2023
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants