There was a problem generating the rebase commit

[mathjeff]

Select Topic Area

Bug

Body

I've generated a pull request that appears to be one commit ahead of main, and I'm finding the "Rebase and merge" button doesn't work.

I made a persistent repro at mathjeff/Github-rebase-test#1 (I originally noticed this at mathjeff/JeffsKnowledgeGraph#4 )

Specifically:

origin/transformers-2 refers to c25948ab1874a3ed09d31cc5c8f72d45732f3df4 which is a non-merge commit with a single parent: 387c817bcd08584a5d54c8b52f53c58c77a720e0 which matches origin/master (in the repository I originally reproduced this in, it was origin/main, but I must have accidentally changed the branch name when making the repro Github-rebase-test)

When I select "Rebase and merge", Github tells me "There was a problem generating the rebase commit."
However, if I select "Squash and merge", Github tells me "This branch has no conflicts with the base branch".
If I select "Merge pull request", Github tells me "This branch has no conflicts with the base branch.

This looks like it might be similar to https://stackoverflow.com/questions/50012036/github-cant-rebase-my-feature-branch-this-branch-cannot-be-rebased-due-to-con but I've included a repro.

(the original error message I got in the original repository was "This branch cannot be rebased safely
Rebasing the commits of this branch on top of the base branch cannot be performed automatically as this would create a different result than a regular merge." which doesn't seem correct to me - it should produce the same file content (although a different commit hash of course))

Thanks

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

[mathjeff]

I've now submitted the original pull request via "Squash and merge", and it doesn't seem to have interfered with the dedicated repro (it still reproduces the issue)

[adtac]

We're seeing the same issue on https://github.com/subtrace/subtrace. In case others want to maintain a linear history without squashing commits, here's how you can merge PRs from the command line after you've opened a PR to merge from pr-branch into master:

git checkout pr-branch
git pull --rebase origin master

git checkout master
git merge pr-branch --ff-only
git push

Here's an example PR we merged recently using this: subtrace/subtrace#124

[connor-27]

Hello,

I am experiencing the same issue.

For testing purposes, I created a new branch called feature/test123 from the main branch and made a test commit (adding a simple text to the README).
When I attempted to create a pull request from feature/test123 to main and used the "rebase and merge" button, it did not work properly.

✔ The error displayed is:
"Merge attempt failed. This branch can't be rebased."

✔ I also tried enabling the "Try the new merge experience" option, but the same error persists:
"This branch can't be rebased."

---

While this issue remains unresolved, I can manually rebase the branch on my local machine based on main and proceed with a squash merge. However, it feels like GitHub has been experiencing a lot of minor bugs recently.

It’s quite disappointing to see a growing number of cases where stability is not guaranteed.

I would greatly appreciate a quick resolution for this issue.

Thank you.

cc. @mathjeff

[hikouki-gumo]

This issue blocks development process, should it be consider as an incident?

[spiltcoffee]

Yes, this. It's blocking all work at my org from being merged as we only allow the "Rebase and merge" strategy.

[minhpq-vbee]

Same issue. Please fix it asap!

[dainb-vbee]

yesir !, me too

[huannd-vbee]

Me too, quick fix pls...

[hechaoyong]

Me too, block the team development...

[dharmab]

Seeing this for all PRs on https://github.com/dharmab/skyeye also, thought I was going crazy!

[johnwonkim]

Issue is also occurring on enterprise cloud repos.

[DavidGamba]

Running into this issue in my company's enterprise repos.

[johnoct-au]

This is also happening to my company's enterprise repos. This should be considered an incident

[youngsung-acloset]

Same here but It's happening only one repo not every repos

[spiltcoffee]

Not every? As in, you are able to use the "Rebase and merge" strategy on some of your repos? Anything different about them?

[Woojin-Choi]

It's also happening to my company in only one repo not every repos. please fix it asap

[spiltcoffee]

Not every? As in, you are able to use the "Rebase and merge" strategy on some of your repos? Anything different about them?

[Woojin-Choi]

I don't think there is anything different, but the problem only occurred in some repos.
But now it has been resolved after closing and reopening!

[phuc-tranh-otsv]

Same issue. Please fix it asap!

[varon27]

Same over here, 3 PRs approved but can't merge.

[sersheed]

facing the same issue, please fix asap

[TonyDo99]

Damn, i also got this issue. What happen !!!!!!!!

[yeeunSim]

I was working as usual, but for some reason, the rebase and merge option stopped working. I initially thought I might have made a mistake, but no matter how much I reviewed my process, it didn’t make sense. This feels like an issue on GitHub’s side, and it’s been really frustrating. Even though there are no conflicts, I keep getting the message, "This branch cannot be rebased due to conflicts," and the merge isn’t going through. Please address this issue as soon as possible—it’s severely affecting my workflow.

[hyjoong]

same issue

[LllllT1208]

ooops...

[jc849]

Close the PR then reopen it seems could workaround the problem ...

[laurence-nguyen]

Doesn't work for me

[hechaoyong]

It works for me, thanks

[johnal95]

Worked for me as well @jc849

[eagle-25]

It works for me too, thx!

[kng27]

works for me

[eagle-25]

A new update was posted.

We believe to have found a root cause, and in the process of verifying the mitigation.

[wenlingz]

same issue, please fix ASAP

[ankitbansalnviz]

It is working now.

[Jonalogy]

Issue resolved (Incident report)

[halay08]

It's still not working on my end.

[merri-dei]

Did you try changing the base branch of the PR then back again?

[halay08]

Ah, it's working now after I did force-push. Thank you!

[kenstack-ltd]

Still not working. I cannot merge my PR

[ganesh-getweave]

Update:
The incident has been resolved, but please note affected pull requests will self repair when any commits are pushed to the pull requests' base branch or head branch. If you encounter problems with a rebase and merge, either click the "update branch" button or push a commit to the PR's branch.

ref: https://www.githubstatus.com/incidents/78wybrzyv0wf

[kenstack-ltd]

It worked. Thanks @ganesh-getweave

[snehalahire]

Issue can be resolved by applying any of the following

1. changing the base branch temporary and assigning the branch back
2. pushing new commits

[kenstack-ltd]

Yep! that is.

[passingbreeze]

Hi I thought it had been done yesterday, but still in problem. When can it be fixed?

[DennisJensen95]

Have you updated the PR with either of these steps from above?

1. changing the base branch temporary and assigning the branch back
2. pushing new commits

[dharmab]

You can quickly re-push the last commit with git commit --amend --no-edit, then git push -f.

[codejnki]

GitOps drives our entire operations, so this is not a feasible answer for many organizations. Can we at least get an acknowledgment from GitHub that the issue has resurfaced and that they are working on it?

[spiltcoffee]

According to the related incident from GitHub Status...

The incident has been resolved, but please note affected pull requests will self repair when any commits are pushed to the pull requests' base branch or head branch. If you encounter problems with a rebase and merge, either click the "update branch" button or push a commit to the PR's branch.

https://www.githubstatus.com/incidents/78wybrzyv0wf

So I don't think you'll get any further acknowledgements.

[skerr4311]

Still an active issue. I have tried all suggestions to resolve:

1. pushing a small change.
2. forcing an empty push.
3. switching base branch.
4. closing and reopening.

Thankfully it was a small PR and it didn't take long to close and recreate. Some more investigation is needed on this issue.

[skerr4311]

Update: git rebase -i main was the final trick that ended up fixing my branch conflicts. I needed to go though every commit one by one resolving conflicts I have already handled in the life cycle of the pr.

[tahminator]

Yup, still happening

[KaitoMuraoka]

I'm encountering the same issue and am confused. 😕
I've reviewed the rules, but they seem fine...
I can't understand why such a critical problem is being left unaddressed.😵‍💫