Github user xubo245 commented on the issue:
https://github.com/apache/carbondata/pull/2161
refresh your local code:
git fetch --all
rebase to latest master branch code:
git rebase -i origin/master
fix the conflict and push again---
