Merge pull request #555 from bstansberry/Issue_549

[Issue_549] allow-unrelated-histories in the merge of main
wildfly · Feb 29, 2024 · ef681c3 · ef681c3
2 parents 704ce69 + 653303f
commit ef681c3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/update_post_merge.yml b/.github/workflows/update_post_merge.yml
@@ -60,7 +60,7 @@ jobs:
             # includes .github/workflows changes that are not in the PR branch
             MERGE_MSG="Merge 'main' into '${FIX_BRANCH_NAME}'"
             echo "${MERGE_MSG}"
-            git merge origin/main -m "${MERGE_MSG}"
+            git merge origin/main --allow-unrelated-histories -m "${MERGE_MSG}"
           fi
           
           readonly OLD_DATE=$(echo ${OLD_POST} | sed -E "s/([0-9]{4}\-[0-9]{2}\-[0-9]{2}).*/\1/")