==> Starting build()...
On branch master
Your branch is up-to-date with 'origin/master'.
You are currently cherry-picking commit 224af80.

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

Otherwise, please use 'git reset'
==> ERROR: A failure occurred in build().
    Aborting...