dlovell commented on PR #8463: URL: https://github.com/apache/arrow-datafusion/pull/8463#issuecomment-1846939584
To resolve these conflicts should I upmerge into main? (I started from `branch-33` because I was making the changes so I could use them with `datafusion-python` `33.0.0`.) ``` Conflicting files datafusion-cli/Cargo.lock datafusion/expr/src/built_in_function.rs ``` -- 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]
