gistfile1.txt

git rebase -i upstream/master

pick all, fixup 1 one line.

Get stuck here:

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'
# Not currently on any branch.
# You are currently rebasing.
#   (all conflicts fixed: run "git rebase --continue")
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	contrib/contrail_moxie/contrail_moxie/templates/out/
#	venv/
nothing added to commit but untracked files present (use "git add" to track)
Could not apply b068c30... temporarily use kazoo-1.3.1 for contrail, should go back to 1.4piston2


git commit --allow-empty doesn't work. What next?