stevenzwu commented on PR #11011: URL: https://github.com/apache/iceberg/pull/11011#issuecomment-2311125687
`apply` cmd used three-way merge for conflict. just to be safe, can you also run the diff and make sure diffs are not related to your change? ``` git diff --no-index flink/v1.19/flink/src/main/java/org/apache/iceberg/flink/sink flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/sink git diff --no-index flink/v1.19/flink/src/test/java/org/apache/iceberg/flink/sink flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/sink ``` -- 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: issues-unsubscr...@iceberg.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org For additional commands, e-mail: issues-h...@iceberg.apache.org
