mihaibudiu commented on PR #4084:
URL: https://github.com/apache/calcite/pull/4084#issuecomment-2532941284

   this is a small change, so if you can apply it on top of main it's best.
   in general, you should use rebase and not merge when resolving conflicts, 
then this won't happen.
   


-- 
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]

Reply via email to