You can tell it to always prefer the changes of the commit you are cherry-picking:
git cherry-pick commitish --strategy-option theirs
commitish can be a SHA-1 hash of a commit, or a branch-name for the lastest commit of that branch, branch-name~1 for the commit before that etc.
If you want to do the reverse, use:
git cherry-pick commitish --strategy-option ours
The shorthand for --strategy-option is -X (uppercased X).
PS: What is the commit-ish, tree-ish?