m-g-r commented on PR #2646: URL: https://github.com/apache/thrift/pull/2646#issuecomment-1227458342
> > Could you tell me where and when you get this error? > > On this page. Not sure if you can see it as well, since you may not have the necessary permissions. > >  Indeed that looks different for me:  Well, why do you not use a different merge strategy? That pull down menu that shows "Rebase and merge" should also have the strategies "Create a merge commit" or "Squash and merge", right? Both should work. The reason that rebase wouldn't work is that it tries to rebase each commit individually and that doesn't work as support for Kotlin was added meanwhile and thus I had to fix that when merging with current master. This fixing is in this commit: https://github.com/apache/thrift/pull/2646/commits/78e3582a65d326a9757dd9afdf9fdb3f0aa601f1 Hard to make rebase and revert commits work at the same time... -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
