From 698177466260e0f7fce9c18ec95987c4e1ce83ed Mon Sep 17 00:00:00 2001
From: CanbiZ <47820557+MickLesk@users.noreply.github.com>
Date: Fri, 10 Jan 2025 17:09:58 +0100
Subject: [PATCH] Update merge-main.yml

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

diff --git a/.github/workflows/merge-main.yml b/.github/workflows/merge-main.yml
index 736d555d8..fa8a984ba 100644
--- a/.github/workflows/merge-main.yml
+++ b/.github/workflows/merge-main.yml
@@ -23,7 +23,7 @@ jobs:
         run: |
           git fetch origin
           git checkout update-app-headers
-          git merge origin/main --no-ff --no-commit -m "Merge main into update-app-headers"
+          git merge origin/main --allow-unrelated-histories --no-commit -m "Merge main into update-app-headers"
           git push origin update-app-headers > /dev/null 2>&1 || true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}