chunweilei commented on issue #1209: [CALCITE-2601] Add REVERSE function URL: https://github.com/apache/calcite/pull/1209#issuecomment-493828885 You almost do the right thing. I think you may wrong only when you resolve conflicts. You should: ``` git checkout master git fetch apache git merge apache/master git push origin master git checkout dev_branch git pull --rebase origin 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: us...@infra.apache.org With regards, Apache Git Services