Merge pull request #7466 from hashicorp/dnephin/support-cherry-pick-merge-PRs

ci: support cherry-picking of merge PRs

.circleci/scripts/cherry-picker.sh

@@ -27,7 +27,7 @@ function cherry_pick_with_slack_notification {
 
     git checkout $branch || exit 1
     # If git cherry-pick fails, we send a failure notification
-    if ! git cherry-pick $commit; then
+    if ! git cherry-pick --mainline 1 $commit; then
         status "🍒❌ Cherry pick of commit ${commit:0:7} from $pr_url onto $branch failed!"
         curl -X POST -H 'Content-type: application/json' \
         --data \