"Update branch" still clickable, even though merge commits have been disabled #129067
Unanswered
renet
asked this question in
Pull Requests
Replies: 0 comments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
-
Select Topic Area
Bug
Body
I've activated a branch protection rule for
**/*
(all) branches with☑️ Require linear history
activated. This results in the following hint and a disabled "Update with merge commit" option for updating the branch in a PR:However, clicking on the button, without explicitly selecting "Update with rebase" first, still performs an "Update with merge commit" action.
Expected behavior
When the current branch has a branch protection rule applied with
☑️ Require linear history
checked, the button for updating the branch shows "Rebase branch" by default and performs a rebase instead of creating a merge commit.Workaround
To prevent users from accidentally creating a merge commit by clicking the "Update branch" button, the
☑️ Do not allow bypassing the above settings
option can be checked in the branch protection rule. The button then still tries to perform an "Update with merge commit" action by default, but fails and an error message is being displayed instead.Beta Was this translation helpful? Give feedback.
All reactions