Merge release/patch branch into master

monstajoe2002 · Dec 2, 2023 · 380448b · 380448b
1 parent 5652455
commit 380448b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -21,7 +21,7 @@ jobs:
             git fetch
             git pull
             git checkout master
-            git merge --no-ff release/patch
+            git merge --allow-unrelated-histories --no-ff release/patch
             git push origin master
   build:
     strategy: