aajisaka commented on PR #4717: URL: https://github.com/apache/hadoop/pull/4717#issuecomment-1312930418
> CONFLICT (content): Merge conflict in hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/BasePBImplRecordsTest.java I could reproduce it. It's related to YARN-11294. Would you rebase it for the latest trunk? I'm not sure why GitHub doesn't complain about 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] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
