Github user arina-ielchiieva commented on the issue:
https://github.com/apache/drill/pull/1027
Could not cherry-pick changes into merge branch. Please check and fix:
```
$ git cherry-pick
4b984baf4ad78fbfd7bf21cf58fb91ff3a74be88^..a690b97074376a65ac0c1d86ee2a9fa32e997003
On branch MERGE-112617-00
You are currently cherry-picking commit d375eeb.
nothing to commit, working directory clean
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:
git commit --allow-empty
If you wish to skip this commit, use:
git reset
Then "git cherry-pick --continue" will resume cherry-picking
the remaining commits.
```
---
