Support selecting the git-strategy to use when doing the cherry-pick

Realized that most of the time I have failure in the backport, it is due to a very simple conflict where running `-X theirs` would have been enough.
Does it sound reasonable to add such an option to the action?