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

"This branch is out-of-date with the base branch" message under PRs #15031

Closed
hishamco opened this issue Jan 10, 2024 · 6 comments
Closed

"This branch is out-of-date with the base branch" message under PRs #15031

hishamco opened this issue Jan 10, 2024 · 6 comments

Comments

@hishamco
Copy link
Member

Today I noticed that the PRs show the following message This branch is out-of-date with the base branch is this something because of the latest patch release or is there something else happening?!!

/cc @MikeAlhayek @Piedone @sebastienros

@MikeAlhayek
Copy link
Member

I think @sebastienros changed the repo settings. I am guessing he enabled "Requires branches to be up to date before merging" settings yesterday.

@Piedone
Copy link
Member

Piedone commented Jan 10, 2024

Yep, that's it. I didn't change it. It's useful though (and as a core contributor you can bypass it too).

@Piedone Piedone changed the title branch is out-of-date "This branch is out-of-date with the base branch" message under PRs Jan 10, 2024
@MikeAlhayek
Copy link
Member

@sebastienros this option is pretty annoying :). Can we disable it?

It would be nice to have an optional button that would allow us to rebase a PR from UI. But it is annoying that you can't merge a PR without having to rebase even when there is no conflicts. Like if you want to merge PR's back to back. Currently, if you have 2 PRs that you want to merge, you have to merge the first one, rebase the second, then merge the second.

@Piedone
Copy link
Member

Piedone commented Jan 11, 2024

You can bypass it if you deem the merge safe:
image

@MikeAlhayek
Copy link
Member

@Piedone you must have more access than I do on the project. I Can't by pass it. also it seems that I am only able to update my own branches not others.

image

@Piedone
Copy link
Member

Piedone commented Jan 11, 2024

Ah, I see, Hmm, this is dumb like this.

I just learned that there is an "Always suggest updating pull request branches" config that displays this button even without branch protection. So, I enabled that and disabled this from the branch protection rule.

So now you have this:

image

I think we have the crisis averted, but @sebastienros feel free to reopen and argue, but it seems this just annoys those people who do the most work.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

3 participants