From 8f513be858c0f77e29c027518a7e15ada6c78302 Mon Sep 17 00:00:00 2001
From: willdavsmith <willdavsmith@gmail.com>
Date: Mon, 15 Apr 2024 12:53:45 -0700
Subject: [PATCH] Adding upmerge workflow

Signed-off-by: willdavsmith <willdavsmith@gmail.com>
---
 .github/workflows/upmerge.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/upmerge.yaml b/.github/workflows/upmerge.yaml
index 1542f0cda..cc9122d20 100644
--- a/.github/workflows/upmerge.yaml
+++ b/.github/workflows/upmerge.yaml
@@ -37,7 +37,7 @@ jobs:
           export SOURCE_BRANCH=${{ inputs.version }}
           echo "Upmerging samples from $SOURCE_BRANCH to edge"
           git fetch origin $SOURCE_BRANCH
-          git merge --no-commit origin/$SOURCE_BRANCH
+          git merge --no-commit origin/$SOURCE_BRANCH --allow-unrelated-histories
       - name: Commit changes
         run: |
           git commit -m "Upmerge to edge"