jgcaap@jgcaap-P5Q:~/Androidkernel/jgcaap$ git cherry-pick 60fb15d
error: cherry-pick is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit, or use
hint: 'git commit -a'.
fatal: cherry-pick failed
jgcaap@jgcaap-P5Q:~/Androidkernel/jgcaap$ git status
On branch shipping/cm-11.0
Your branch is up-to-date with 'origin/shipping/cm-11.0'.
You are currently cherry-picking commit 60fb15d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)

    both modified:   sound/soc/codecs/wcd9320.c

no changes added to commit (use "git add" and/or "git commit -a")
jgcaap@jgcaap-P5Q:~/Androidkernel/jgcaap$ git add sound/soc/codecs/wcd9320.c
jgcaap@jgcaap-P5Q:~/Androidkernel/jgcaap$ git cherry-pick 60fb15d
error: Your local changes would be overwritten by cherry-pick.
hint: Commit your changes or stash them to proceed.
fatal: cherry-pick failed
jgcaap@jgcaap-P5Q:~/Androidkernel/jgcaap$ git push
Everything up-to-date
jgcaap@jgcaap-P5Q:~/Androidkernel/jgcaap$ git status
On branch shipping/cm-11.0
Your branch is up-to-date with 'origin/shipping/cm-11.0'.
You are currently cherry-picking commit 60fb15d.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

    modified:   sound/soc/codecs/wcd9320.c

jgcaap@jgcaap-P5Q:~/Androidkernel/jgcaap$ git cherry-pick --continue
error: cannot run Vim: No such file or directory
error: unable to start editor 'Vim'
Please supply the message using either -m or -F option.
jgcaap@jgcaap-P5Q:~/Androidkernel/jgcaap$ ^C
jgcaap@jgcaap-P5Q:~/Androidkernel/jgcaap$ git merge
fatal: You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).
Please, commit your changes before you can merge.
jgcaap@jgcaap-P5Q:~/Androidkernel/jgcaap$ git status
On branch shipping/cm-11.0
Your branch is up-to-date with 'origin/shipping/cm-11.0'.
You are currently cherry-picking commit 60fb15d.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

    modified:   sound/soc/codecs/wcd9320.c

jgcaap@jgcaap-P5Q:~/Androidkernel/jgcaap$ git push
Everything up-to-date