From b12f1fa179727a4e70510da2e55cb2c36d102d34 Mon Sep 17 00:00:00 2001 From: cocobo1 Date: Sun, 14 Sep 2025 11:20:49 +0300 Subject: [PATCH] fix(merge): correct merging issue --- .forgejo/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index b60f35c..e5b6a9d 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -57,5 +57,5 @@ jobs: git config --local user.name "Forgejo Actions" git fetch origin git checkout github || git checkout -b github - git merge origin/main --no-edit + git merge origin/main --no-edit --allow-unrelated-histories git push origin github \ No newline at end of file