Allow merging unrelated histories

2025-04-23 11:58:55 +02:00 · 2025-04-23 11:58:55 +02:00 · 4c3f415759
commit 4c3f415759
parent a383314040
1 changed files with 2 additions and 1 deletions
--- a/.gitea/workflows/workflow.yml
+++ b/.gitea/workflows/workflow.yml
@ -1,3 +1,4 @@
+name: Workflows
 on:
  push:
    branches:
@ -23,7 +24,7 @@ jobs:
        run: git fetch aur
      
      - name: Merge latest changes
-        run: git merge aur/master
+        run: git merge aur/master --allow-unrelated-histories
      
      - name: Push changes (if any)
        run: git push origin master