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

[meta] Don't require merge queue for PRs #1075

Closed
mgiuca opened this issue Apr 24, 2023 · 3 comments
Closed

[meta] Don't require merge queue for PRs #1075

mgiuca opened this issue Apr 24, 2023 · 3 comments
Assignees

Comments

@mgiuca
Copy link
Collaborator

mgiuca commented Apr 24, 2023

Spinning off from #1069. @marcoscaceres did you change a setting here or is GitHub forcing this upon us?

(I think I used to be an admin but I don't appear to be any more... I can access some Settings but most are hidden from me.)

This is what I see on the submit button for an approved PR:

image

The drop-down has no other options. I don't recall seeing this before; I was previously given a choice to squash or merge.

In Settings, it still seems to be set up that way, so I'm not sure what's changed or why it's forcing us to use Merge Queue (I don't even see an option for Merge Queue):

image

The problem with Merge Queue is that there doesn't appear to be any way to set the commit message. I don't know what the default message is, but it probably uses the text of the first message in the PR, which would be inappropriate since it contains the Preview and Diff links as well as our checklist, etc. It doesn't look like we've landed any PRs since this change happened.

Merge Queue seems to be useful for repos with a very high commit rate, to avoid conflicts with manually merging. But this repo gets ~1 commit / month so it doesn't feel necessary :)

@mgiuca
Copy link
Collaborator Author

mgiuca commented Apr 24, 2023

Apparently this might be a branch-specific setting? Maybe it happened when you changed over from gh-pages to main - can you check the settings on the main branch?

@mgiuca
Copy link
Collaborator Author

mgiuca commented Apr 26, 2023

This doesn't seem to be working at all: #1076

@mgiuca
Copy link
Collaborator Author

mgiuca commented Apr 27, 2023

We worked it out in the meeting today. Marcos found the button to turn it off. (It was unintentional.)

For reference, it was under Settings -> Branches -> main (Edit) -> Require merge queue.

I landed #1076 and "squash and merge" works fine.

@mgiuca mgiuca closed this as completed Apr 27, 2023
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

No branches or pull requests

2 participants