So, rebasing should never be used on any branch that has been pushed to the
main repo.
The only branch I regularly rebase, is my local main development branch.
However, I don’t quite understand, why a “squash merge” is possible, but a
normal merge isn’t.
Technically they should be the same.
Chr
Hi Christofer Dutz,
We also find this very strange, just like what tison encountered last time.
Even more, we try to use the command line to merge and it works fine, but
GitHub's UI prompts an error. But this problem doesn't come up every time.
We can provide the PR link the next time I encounter
Hi LinkinStar,
I’m currently digging through a huge pile of stuff, as I was on holidays for
almost a week and I had done some open-source detox ;-)
Will try to squeeze it in …
Chris
Von: LinkinStar
Datum: Dienstag, 2. April 2024 um 10:26
An: dev@answer.apache.org
Betreff: Re: Quick question
