fix: cherry-pick instead of rebasing

gr2m · Oct 16, 2019 · 2fd25ff · 2fd25ff
1 parent 2621f83
commit 2fd25ff
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/index.js b/index.js
@@ -213,7 +213,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;