> git init
Initialized empty Git repository in /private/tmp/r/.git/
> echo initialContent >a
> git add a
> git commit -m "initial content"
[master (root-commit) 6974c2e] initial content
 1 file changed, 1 insertion(+)
 create mode 100644 a
> git checkout -b side
Switched to a new branch 'side'
> echo modifiedOnSide >a
> git commit -a -m "modified on side branch"
[side f9100a0] modified on side branch
 1 file changed, 1 insertion(+), 1 deletion(-)
> git checkout master
Switched to branch 'master'
> echo modifiedOnMaster >a
> git commit -a -m "modified on master branch"
[master 5286c45] modified on master branch
 1 file changed, 1 insertion(+), 1 deletion(-)
> git log --all --oneline --decorate --graph
* 5286c45 (HEAD -> master) modified on master branch
| * f9100a0 (side) modified on side branch
|/
* 6974c2e initial content
> git cherry-pick side
error: could not apply f9100a0... modified on side branch
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
> echo modifiedOnMaster >a
> git add a
> git commit
On branch master
You are currently cherry-picking commit f9100a0.

nothing to commit, working tree 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'
> git reset
> git status
On branch master
nothing to commit, working tree clean
>