Use 3-way merge for git am and git apply in cherry-pick script (#565)

Author: gretay-js

scripts/cherry-pick.sh

@@ -108,10 +108,10 @@ apply_patches () {
         echo "Applying $patchfile"
         if [ "$index" -eq 0 ] ; then
             # use the commit details of the first patch
-            git am "$patchfile" "--committer-date-is-author-date"
+            git am -3 "$patchfile" "--committer-date-is-author-date"
         else
             # for subsequent patches, just amend the previous commit
-            git apply "$patchfile" #"--whitespace=fix" ?
+            git apply -3 "$patchfile" #"--whitespace=fix" ?
             git add .
             git commit --amend --no-edit
         fi