Allowed unrelated histories

mbuchoff · Jul 24, 2024 · 55ec72e · 55ec72e
1 parent 800b5fe
commit 55ec72e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/chatgpt.yaml b/.github/workflows/chatgpt.yaml
@@ -39,7 +39,7 @@ jobs:
           echo "Done. Running git checkout..."
           git checkout $TARGET_BRANCH
           echo "Done. Running git merge..."
-          git merge --no-ff --no-edit $BRANCH
+          git merge --no-ff --no-edit $BRANCH --allow-unrelated-histories
           echo "Done. Running git push..."
           git push origin $TARGET_BRANCH