fix(merge): correct merging issue

This commit is contained in:
cocobo1 2025-09-14 11:20:49 +03:00
parent 2cc780e172
commit b12f1fa179

View file

@ -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