ChenSammi edited a comment on pull request #2018: URL: https://github.com/apache/ozone/pull/2018#issuecomment-811784301
> I fetched the original commits from @adoroszlai (`git fetch origin 98b6a07c2b5f4af2b003f68f2b4e5d2f6a27d37c`) and merged it back to the latest branch from @ChenSammi and finally pushed it (`git push [email protected]:ChenSammi/ozone.git HEAD:HDDS-4936`) > > Now it should contain all the fixes. Thanks @elek for the help. I tried to rebase this branch with master to resolve the conflicting files, but met a lot of unexpected conflicts. So I manually applied @adoroszlai 's patche one by one. Here is the new MR https://github.com/apache/ozone/pull/2104. Let's continue the discussion in https://github.com/apache/ozone/pull/2104. -- 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. For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
