git cherry-pick +commit

It took 2.01 seconds to enumerate untracked files. 'status -uno'
may speed it up, but you have to be careful not to forget to add
new files yourself (see 'git help status').
nothing added to commit but untracked files present
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'

这个分支已经之前提交过，如果要重复提交，需要做空提交 git commit --allow-empty

fatal: cannot do a partial commit during a cherry-pick
1. 提交全部
git commit -a 
2. 如果不想提交全部,那么可以通过添加 -i 选项
git commit file/to/path -i -m "merge"