From c9d5e12c64172990d02afcb2336e0a1861d2d9ab Mon Sep 17 00:00:00 2001
From: Mohan Raj <mohanraj.pachaiyappan@news.co.uk>
Date: Mon, 19 Feb 2024 19:59:21 +0000
Subject: [PATCH] new build step with email

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

diff --git a/.github/workflows/plugin-build.yml b/.github/workflows/plugin-build.yml
index 1f19295..2e200a6 100644
--- a/.github/workflows/plugin-build.yml
+++ b/.github/workflows/plugin-build.yml
@@ -55,7 +55,7 @@ jobs:
                   echo "password=${{ secrets.GITHUB_TOKEN }}" >> .git/credentials
                   git fetch origin main-built
                   git checkout -b main-built
-                  git merge origin/main-built
+                  git merge --allow-unrelated-histories origin/main-built
                   git add -A  # Stage all changes, including untracked files
                   git clean -fdX
                   git commit -m "Built WordPress plugin" --no-verify