suneet-s commented on pull request #10332: URL: https://github.com/apache/druid/pull/10332#issuecomment-689074103
@joykent99 the way I resolve merge conflicts is like this ``` git fetch upstream git merge upstream/master # Resolve merge conflicts manually # ... git push origin <branch> ``` This way you don't need to force push, so the comment history is still referenceable in the PR. I think the change looks good to me, just going to do a once over today and post final comments. Thanks again for fixing this! ---------------------------------------------------------------- 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]
