When we are cherry-picking changes, we always prefer to cherry-pick the original change. This is better for readability in the repository when the cherry-pick is all completed, but it can be painful during the actual cherry-pick process, where there may be a secondary branch that has resolved some of the same merge-conflicts. `git-webkit cherry-pick` should provide an option to use the merge-conflicts from a specified branch while cherry-picking from the original branch.
<rdar://problem/114656645>
The addition of `--use-original` improves this situation, so this isn't a high priority.