navinko commented on PR #10993: URL: https://github.com/apache/ozone/pull/10993#issuecomment-5346548884
> > Sure @szetszwo will make sure going forward. I saw new conflict today so rebased and force push. > > @navinko you can use git --merge master instead of git --rebase to avoid the force push in case of conflicts. > `git pull --merge apache master` Thanks @Gargi-jais11 sure! -- 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]
