From 653303fac66ed36778d83d63e9f8fc17d0914442 Mon Sep 17 00:00:00 2001
From: Brian Stansberry <brian.stansberry@redhat.com>
Date: Thu, 29 Feb 2024 12:53:20 -0600
Subject: [PATCH] [Issue_549] allow-unrelated-histories in the merge of main

---
 .github/workflows/update_post_merge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update_post_merge.yml b/.github/workflows/update_post_merge.yml
index ef351f9c..eafcd1cb 100644
--- 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/")