swapna267 opened a new pull request, #16209:
URL: https://github.com/apache/iceberg/pull/16209

   Backport of https://github.com/apache/iceberg/pull/15780 
   
   Clean backport except class,
   
flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/sink/dynamic/TestDynamicTableUpdateOperator.java
     
   
   ```
   Conflict 1 (line 26) — import:
     <<<<<<< ours
     import org.apache.flink.api.common.functions.OpenContext;
     =======
     import org.apache.flink.configuration.Configuration;
     >>>>>>> theirs
   
     Conflicts 2–6 (lines 74, 108, 153, 200, 240) — all identical pattern:
     <<<<<<< ours
                 CASE_SENSITIVE,       // (or caseSensitive / CASE_INSENSITIVE)
                 PRESERVE_COLUMNS);    // (or DROP_COLUMNS)
         operator.open((OpenContext) null);
     =======
                 flinkDynamicSinkConfiguration(CASE_SENSITIVE, 
PRESERVE_COLUMNS));  // (or corresponding args)
         operator.open(null);
     >>>>>>> theirs
   ```


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

Reply via email to