added --allow-unrelated-histories

nchantarotwong · Jan 27, 2022 · 9cb8090 · 9cb8090
1 parent de87b21
commit 9cb8090
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -42,7 +42,7 @@ echo
 set -o xtrace
 
 # Do the merge
-git merge --no-ff --no-edit $INPUT_FROM_BRANCH
+git merge --no-ff --no-edit $INPUT_FROM_BRANCH --allow-unrelated-histories
 
 # Push the branch
 git push --force origin $INPUT_TO_BRANCH