mimaison commented on PR #18039:
URL: https://github.com/apache/kafka/pull/18039#issuecomment-2580905784

   ```
   Conflicting files
   core/src/main/java/kafka/log/remote/RemoteLogManager.java
   core/src/main/java/kafka/server/TierStateMachine.java
   core/src/main/scala/kafka/log/UnifiedLog.scala
   core/src/test/java/kafka/log/remote/RemoteLogManagerTest.java
   core/src/test/scala/unit/kafka/cluster/PartitionLockTest.scala
   core/src/test/scala/unit/kafka/cluster/PartitionTest.scala
   core/src/test/scala/unit/kafka/log/LogCleanerManagerTest.scala
   core/src/test/scala/unit/kafka/log/LogCleanerTest.scala
   core/src/test/scala/unit/kafka/log/LogLoaderTest.scala
   core/src/test/scala/unit/kafka/log/LogTestUtils.scala
   core/src/test/scala/unit/kafka/log/UnifiedLogTest.scala
   core/src/test/scala/unit/kafka/server/ReplicaManagerTest.scala
   core/src/test/scala/unit/kafka/utils/SchedulerTest.scala
   
storage/src/test/java/org/apache/kafka/tiered/storage/TieredStorageTestContext.java
   
storage/src/test/java/org/apache/kafka/tiered/storage/actions/ExpectLeaderEpochCheckpointAction.java
 
   ```
   
   😭 
   
   Let's rebase once more!


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

Reply via email to