amaliujia commented on issue #1636: [CALCITE-3568] BigQuery, Hive, Spark SQL dialects do not explicitly support nested aggregates URL: https://github.com/apache/calcite/pull/1636#issuecomment-565682194 You can do the following to resolve conflicts and squash commits: setup Calcite repo you are `upstream` ``` git fetch upstream git rebase -i upstream/master ``` After this process, usually I can have a nice and clean commit locally.
---------------------------------------------------------------- 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
