build(release): compiled action for 1.2.3

[skip ci]
gr2m · Oct 16, 2019 · a498012 · a498012
1 parent 2d28a86
commit a498012
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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) {