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

update Contributors directive to merge to main #1984

Merged
merged 1 commit into from
Dec 15, 2022

Conversation

hipsterusername
Copy link
Member

@lstein - Assuming we're having people merge to main (still calling out doing that AND having an auto-merge is high risk), updating directive to do so.

@blessedcoolant
Copy link
Collaborator

@lstein - Assuming we're having people merge to main (still calling out doing that AND having an auto-merge is high risk), updating directive to do so.

The answer is for the reviewing team to be careful before approving a PR and not do it unless they're absolutely sure it is good to go.

@lstein I wonder if it is possible to set 2 mandatory approval requirements for new or non approved contributors and 1 for the rest?

@lstein
Copy link
Collaborator

lstein commented Dec 14, 2022 via email

@blessedcoolant
Copy link
Collaborator

I think its okay to stay. We can be a tad bit careful and I think it'll have its advantages in the long run. So we don't sit around waiting for checks to pass on PR's that we have fully approved and cleared.

Copy link
Collaborator

@lstein lstein left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for catching that. I guess I fixed this paragraph in the mkdocs, but never in the README.

@lstein lstein enabled auto-merge (rebase) December 14, 2022 21:14
@lstein
Copy link
Collaborator

lstein commented Dec 14, 2022

Case in point on this PR. I reviewed and approved it, and all checks had passed, but because main had been updated since this PR was submitted I had to do an "Update from main" operation before I could do the merge. This of course triggered the CI tests, meaning I would have to come back to this PR in about half an hour to do the actual merge.

Rather than having to come back, I then set auto-merge to true. So now if the CI tests pass (which they should!), the merge will happen without this additional work.

@hipsterusername
Copy link
Member Author

And meanwhile, despite automerge being enabled its... stuck in an "out-of-date" with base branch status. 😂

@lstein lstein merged commit 834e56a into main Dec 15, 2022
@lstein lstein deleted the contributor-readme-update branch December 15, 2022 04:42
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

3 participants