From ba2dce338c7d56fbfb7c4e1e878b9d29ce20e8ae Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Wed, 16 Oct 2019 22:46:53 +0000
Subject: [PATCH] build(release): compiled action for 1.2.5

[skip ci]
---
 dist/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dist/index.js b/dist/index.js
index 845118f2..430ae24a 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -654,7 +654,7 @@ async function checkOutRemoteBranch(branch) {
     core.info(`Remote branch "${branch}" checked out locally.`);
 
     await runShellCommand(
-      `git rebase -X theirs --allow-empty-message "${TEMPORARY_BRANCH_NAME}"`
+      `git cherry-pick --strategy recursive --strategy-option theirs ${TEMPORARY_BRANCH_NAME}`
     );
 
     return true;