Обновить .gitea/workflows/automerge-with-core.yaml

2024-03-03 19:07:24 +00:00 · 2024-03-03 19:07:24 +00:00 · 67742c3386
commit 67742c3386
parent fe694fcff0
1 changed files with 1 additions and 1 deletions
--- a/.gitea/workflows/automerge-with-core.yaml
+++ b/.gitea/workflows/automerge-with-core.yaml
@ -26,7 +26,7 @@ jobs:
          echo "Cloning Fetch core"
          git fetch core
          echo "Cloning Merge core"
-          git merge --allow-unrelated-histories core/main
+          git merge -s subtree --allow-unrelated-histories core/main
          echo "Cloning Push core"
          git push --force
          echo "OK"