caicancai commented on PR #3544: URL: https://github.com/apache/calcite/pull/3544#issuecomment-1846450384
> As for rebase, usually it's enough to do `git fetch upstream; git rebase upstream main` But this can be more complicated if you have conflicts. In your case you have to not just rebase but combine all your 4 commits into one. yes, I'm trying -- 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]
