Rebase button shows "Rebase conflict between head and base" when no conflicts exist

[malinindev]

Select Topic Area

Bug

Body

In the ЗК interface there is a “Rebase branch” button that rebases directly from the GitHub UI.
For the last ~2 days GitHub started showing: Rebase conflict between head and base

However, there are actually no conflicts. Rebasing the same branch locally completes successfully without any conflicts.

Before that the same workflow worked normally.

Expected behavior
If a branch can be rebased cleanly, the Rebase branch button should be available.

Actual behavior
GitHub UI shows Rebase conflict between head and base and blocks the rebase even though the branch rebases cleanly outside the UI.

[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. ⭐

[mbiencinto]

We're in the same situation; we need another team to be able to overtake, and we've been getting this error for a couple of days now.

[Sunil56224972]

Bro, this is not your fault — it's a GitHub bug an their side. Here's what's going on and what you can do:

Why is this happening?

GitHub's UI rebase is broken right now for some repos. It says "conflict" but there's actually no conflict. It's a known bug that started showing up in the last couple of days. Other people are reporting the same thing (issue #189197).

---

What to do right now:

Just rebase locally from your terminal instead:

step 1 : git checkout your-branch

step 2 : git fetch origin

step 3 : git rebase origin/main

step 4 : git push --force-with-lease

That's it. It'll work fine because there's no actual conflict — GitHub's UI is just tripping.

If you want to help fix it faster:

Go to that GitHub issue page and 👍 upvote it or drop a comment like "same issue here". The more people report it, the faster GitHub's team will fix it.

TL;DR: GitHub's rebase button is bugged right now. Just do the rebase from your terminal — it'll work perfectly. Wait for GitHub to fix their UI. Nothing wrong on your end bro. 💯

[benmezger]

I can confirm we are seeing the same issue on our side. Rebasing manually fixed it of course, but it would be great to do it from the UI like before.

[anasbn3issa]

Same issue for a few days..

[shamoon]

Has become pretty constant for us too, hopefully GH folks are aware, would be great to know if so.

[v-videnov-cl]

We're also seeing the same issue

[netrebel]

So it's not just us! good to hear. Been doing CLI instead rebasing and that works fine.

[troycroz]

Been seeing this for 2-3 weeks on every single PR/branch in our repo