alamb commented on PR #5593: URL: https://github.com/apache/arrow-datafusion/pull/5593#issuecomment-1476231350
> Please help to take a look again. Conflicts are resolved now. LGTM but sadly there appear to be some more conflicts now: <img width="969" alt="Screenshot 2023-03-20 at 9 25 26 AM" src="https://user-images.githubusercontent.com/490673/226353506-4601876f-3994-4b0e-a861-2da26cdfba25.png";> I took the liberty to merge from main and resolve the new conflicts -- I plan to merge this PR when CI passes -- 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]
![https://user-images.githubusercontent.com/490673/226353506-4601876f-3994-4b0e-a861-2da26cdfba25.png"](https://user-images.githubusercontent.com/490673/226353506-4601876f-3994-4b0e-a861-2da26cdfba25.png"){kind=link}