From a4980128b7e2950ff8476891ab8a8e07fe8d1ca3 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Wed, 16 Oct 2019 17:52:24 +0000 Subject: [PATCH] build(release): compiled action for 1.2.3 [skip ci] --- dist/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dist/index.js b/dist/index.js index 3dd86698..c94c99d4 100644 --- a/dist/index.js +++ b/dist/index.js @@ -653,7 +653,9 @@ async function checkOutRemoteBranch(branch) { await runShellCommand(`git checkout ${branch}`); core.info(`Remote branch "${branch}" checked out locally.`); - await runShellCommand(`git rebase -X theirs "${TEMPORARY_BRANCH_NAME}"`); + await runShellCommand( + `git rebase -X theirs --allow-empty-message "${TEMPORARY_BRANCH_NAME}"` + ); return true; } catch (error) {