devmadhuu commented on PR #10946: URL: https://github.com/apache/ozone/pull/10946#issuecomment-5242796528
> @xichen01 I updated the shared feature branch [HDDS-11233](https://issues.apache.org/jira/browse/HDDS-11233) on apache/ozone master to bring it up to date with master. The branch now = the original feature commits (unchanged SHAs) with a single Merge 'upstream/master' commit on top. New tip: [8decb32](https://github.com/apache/ozone/commit/8decb3293699d2731f3dac39fb72600bb25dc7f1). Kindly do merge of this feature branch to your PR branch and resolve the conflicts. Apologies for this confusion. Yes I rebased and force pushed the [HDDS-11233](https://issues.apache.org/jira/browse/HDDS-11233) , but we need to follow the merge process instead of rebase for feature branches and raise PRs and follow the normal PR process. So I reverted the earlier forced push and now raised this PR #10983 Kindly wait till this PR gets merged. -- 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]
