¯\_(ツ)_/¯

arangodb · Apr 27, 2021 · 66285ae · 66285ae
1 parent 37ad598
commit 66285ae
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -65,5 +65,5 @@ jobs:
       - run: git fetch origin main
       - run: git fetch origin stable
       - run: git checkout stable
-      - run: git merge --ff main
+      - run: git merge --ff --allow-unrelated-histories main
       - run: git push origin stable