kaijchen commented on pull request #2495:
URL: https://github.com/apache/ozone/pull/2495#issuecomment-897387110


   > I think we should keep rebasing the changes from the master onto the 
HDDS-4454 branch. Otherwise, it is hard to merge HDDS-4454 back to the master 
in the future. Any thought?
   
   I think merge will also work. It's easier to deal with conflicts if we are 
doing merge.
   
   Rebase will give a clearer history but requires more work to deal with 
conflicts.


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

Reply via email to