Can I use `git commit` instead of `git cherry-pick --continue`?

Solution 1:

It's better to use git cherry-pick --continue.

Say you cherry-pick a few commits and it has conflicts for the first one. After git commit, the cherry-pick procedure pauses. If you don't use git status, or you haven't configured to show branch/status in PS1 (as it does on Windows git-bash), or you just forget that there are more commits, you would probably think that the cherry-pick is finished. And you still need to run git cherry-pick --continue to resume the procedure.

If you use git cherry-pick --continue, it starts to apply the next commit until all are done.