szetszwo commented on pull request #2495: URL: https://github.com/apache/ozone/pull/2495#issuecomment-897498624
> I think merge will also work. It's easier to deal with conflicts if we are doing merge. That's true. In our case, we don't expect a lot of conflicts since we are mainly adding new code. How about we try rebase first? If there are too many conflicts, we may switch to merge. -- 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]
