Rebase no longer an option in out of date PR

[kragoth]

Pull Requests

Bug

Body

When a PR is raised and it is out of date (behind main) there is a button to "Update branch". Until a day or 2 ago, this button had a drop down that would allow me to change how the update was performed, merge or rebase. Today however, the drop down is gone and all I can do is merge.

It seems the ability to rebase is gone. This button was already bad because it ignores the fact I have chosen "Requires linear history" and shouldn't allow merge commits in the first place. But, now with no option to rebase, all PRs need to be manually rebased locally and force pushed again.

I've tried experimenting with different rulesets but, I can't seem to get the rebase functionality to appear again. Is anyone else having this issue?

[github-actions[bot]]

💬 Your Product Feedback Has Been Submitted 🎉

Thank you for taking the time to share your insights with us! Your feedback is invaluable as we build a better GitHub experience for all our users.

Here's what you can expect moving forward ⏩

• Your input will be carefully reviewed and cataloged by members of our product teams. 
  • Due to the high volume of submissions, we may not always be able to provide individual responses.
  • Rest assured, your feedback will help chart our course for product improvements.
• Other users may engage with your post, sharing their own perspectives or experiences. 
• GitHub staff may reach out for further clarification or insight. 
  • We may 'Answer' your discussion if there is a current solution, workaround, or roadmap/changelog post related to the feedback.

Where to look to see what's shipping 👀

• Read the Changelog for real-time updates on the latest GitHub features, enhancements, and calls for feedback.
• Explore our Product Roadmap, which details upcoming major releases and initiatives.

What you can do in the meantime 💻

• Upvote and comment on other user feedback Discussions that resonate with you.
• Add more information at any point! Useful details include: use cases, relevant labels, desired outcomes, and any accompanying screenshots.

As a member of the GitHub community, your participation is essential. While we can't promise that every suggestion will be implemented, we want to emphasize that your feedback is instrumental in guiding our decisions and priorities.

Thank you once again for your contribution to making GitHub even better! We're grateful for your ongoing support and collaboration in shaping the future of our platform. ⭐

[kragoth]

OK, so I found a way to get the rebase button back that makes no sense.

So, this PR is for a feature/my-feature branch being merged into main.
If I go to the repo settings -> Branches -> Rule for branch matching pattern feature/* and uncheck "Require linear history", now the rebase button will appear. This makes no sense. I don't want merge commits, so I enable "Require linear history" but, enabling "Require linear history" means I can no longer rebase, and I can only create merge commits which is what "Require linear history" should stop.

[sithlord48]

I can confirm turning off linear history puts the rebase option back .
We used to be able to have only rebase , Why can't i have an option to ONLY allow rebase updates on pull requests ?

[akaustav]

This issue might have been fixed recently. I am able to see the Rebase button only on our PRs - when we check the "Require Linear History" checkbox in the Branch Protection Rules.

[kragoth]

@akaustav yep, thanks for the update, it is working for me too!

[kragoth]

@akaustav the behviour just reverted for me and I had to go back to using the work around. I'm not sure what's going on.

[kragoth]

OK, so clearing my browser cache seems to have fixed it again.... hopefully it stays working now.

[sithlord48]

I still see this for prs coming from forks but for pr s made from project branches its working again .

[akaustav]

Yeah. 2 days ago, I received a message on my GitHub support request saying that a fix for this issue was released by the GitHub Engineering team. Hence, I posted in this thread after I verified. However, it was working for us for the past 2 days up until about 2 hours ago when it reverted to the old broken behavior. Perhaps they are still in the process of stabilizing the fix? I have followed up on the same GitHub support ticket.