szehon-ho commented on PR #17967: URL: https://github.com/apache/iceberg/pull/17967#issuecomment-5593737264
Looks like this is going to be a bit hard. Looks like the current conflict is caused by #17972 updating sqlite-jdbc. <img width="1036" height="382" alt="Screenshot 2026-09-08 at 5 10 29 PM" src="https://github.com/user-attachments/assets/91df50d6-4706-4208-9f9b-42293cc12c06"; /> What do you think @manuzhang , can you rebase again and then me or @huaxingao can try again? I think only file that would conflict outside 4.2 line is gradle/libs.version -- 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] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
