bbejeck commented on PR #23319:
URL: https://github.com/apache/kafka/pull/23319#issuecomment-5481030717
Just to close this out Root cause was a semantic (not textual) merge
conflict between two independently-green PRs:
- #23242 removed the last existing Collections.* uses in
StoreChangelogReader.java, so the unused-import cleanup dropped import
java.util.Collections;.
- #23285 was branched before #23242 landed and added new
Collections.singleton(...) uses, inheriting the import from its older base.
#23285 was squash-rebased onto post-#23242 trunk at merge time. The rebase
kept the import deletion (untouched context on #23285's side) and applied the
new uses in a different region — no textual conflict, so nothing flagged it
--
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]
