PR UI update branch with rebase broken on conflict-free branches #188709
Replies: 3 comments 1 reply
-
|
I (and others) noticed that the "Update with rebase" option is simply gone; enabling "allow rebase merges" didn't bring it back. |
Beta Was this translation helpful? Give feedback.
-
|
Just commenting that I'm seeing this and our DevOps team has not made any changes to repo configuration that we know of. |
Beta Was this translation helpful? Give feedback.
-
|
Hi all, we appreciate you reaching out to report this issue! The GitHub team is aware of this and they are working on a solution. We'll provide details when they're available in this discussion. Please subscribe to that post to receive real-time notifications on updates. If you have further questions or additional details about your experience, please comment directly there as well. |
Beta Was this translation helpful? Give feedback.
Uh oh!
There was an error while loading. Please reload this page.
-
Select Topic Area
Bug
Body
Hi all,
We’re seeing what looks like a new GitHub PR UI behaviour/regression around rebasing PR branches from the PR page.
What is happening
On conflict-free PRs that are simply behind the base branch,
Update branch->With rebasefails in the PR UI.After enabling
Allow rebase mergingat repository level (to troubleshoot), the issue became explicit:A problem occurred while generating the rebase commitImportant context
This is not isolated to one repository. We reproduced it on multiple repos. This behaviour appears new in our environment. Before Monday, March 3rd, we did not need this extra setting/workaround for the same workflow.
What we validated with git (no actual content conflict)
For affected branches, we checked:
git fetch <remote>thengit rebase -i <remote>/<base>)So from git’s perspective, branches are rebaseable.
Repro steps
Allow rebase mergingwas initially disabled.Update branch->Update with rebasein PR UI.Allow rebase mergingin repo settings for Pull Requests.Update branch->Update with rebaseObserved result
A problem occurred while generating the rebase commitExpected result
GitHub should generate the rebased branch update (same as local git behavior)
Workaround that consistently worked for us
Allow rebase merging(if disabled).mainbranch ordevelopdepending on your internal repo management).After this “base toggle,” the yellow message disappears and rebase update works again.
Why we think this may be platform-side
Questions
Beta Was this translation helpful? Give feedback.
All reactions