From be4ef3e6f7be7d8842bc88238c90ee0030bec766 Mon Sep 17 00:00:00 2001
From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com>
Date: Mon, 12 Jul 2021 17:20:41 +0700
Subject: [PATCH] git merge gl4es: add --allow-unrelated-histories

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

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 756f7bf46..39e9d0a55 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -50,7 +50,7 @@ jobs:
         git remote add upstream https://github.com/PojavLauncherTeam/gl4es
         git fetch upstream
         git checkout master
-        git merge upstream/master || echo "Merge exit code $?"
+        git merge --allow-unrelated-histories upstream/master || echo "Merge exit code $?"
         $ANDROID_NDK_HOME/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk NDK_DEBUG=1
     
     - name: Install gl4es