From 4c3f4157599c8ca9e1881cf90320c4e752494db3 Mon Sep 17 00:00:00 2001 From: Sebastiaan de Schaetzen Date: Wed, 23 Apr 2025 11:58:55 +0200 Subject: [PATCH] Allow merging unrelated histories --- .gitea/workflows/workflow.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/workflow.yml b/.gitea/workflows/workflow.yml index 55a5c67..31c7ca8 100644 --- 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