leventov commented on issue #8848: Refactor DirectDruidClient, extract QueryContextInputStreamResponseHandler URL: https://github.com/apache/incubator-druid/pull/8848#issuecomment-562661329 When you are at the state "old-master -> my patch", you just need to run two actions: `git fetch origin master` and `git merge origin/master`. If there are conflicts, resolve them and commit. Then history will look like this: ``` old-master -> your patch -> merge commit (HEAD of your PR branch) \____ new master _______/ ```
---------------------------------------------------------------- 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] With regards, Apache Git Services --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
