diff --git a/.gitea/workflows/automerge-with-core.yaml b/.gitea/workflows/automerge-with-core.yaml index 7176739..f978924 100644 --- 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 -s subtree --allow-unrelated-histories core/main + git rebase core/main echo "Cloning Push core" git push --force echo "OK"