In the example below, arcpatch-D319 is a diff that has already landed and is marked "closed":
Created and checked out branch arcpatch-D23.
Created and checked out branch arcpatch-D319.
Checking patch <path>...
Checking patch <path>...
Applied patch <path> cleanly.
Applied patch <path> cleanly.
Cherry Pick Failed!
Exception
Command failed with error #1!
COMMAND
git cherry-pick 'arcpatch-D319'
STDOUT
On branch arcpatch-D23
You are currently cherry-picking commit 230bfd3.
nothing to commit, working directory clean
STDERR
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'
(Run with `--trace` for a full exception trace.)
Versions:
* arcanist 8c589f1f759f0913135b8cc6959a6c1589e14ae4 (3 Jun 2015)
* libphutil afc05a9a7f003572c120ecb3dc8d9c9cbd408c84 (2 Jun 2015)
* phabricator e3134a1d478e649df86761acb53a3822fb9409bd (15 May 2015)