diff --git a/index.js b/index.js index e795cf9f..c8254cb5 100644 --- a/index.js +++ b/index.js @@ -212,7 +212,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) {