diff --git a/.gitea/workflows/automerge-with-core.yaml b/.gitea/workflows/automerge-with-core.yaml index 5ea20fe..f0918ad 100644 --- a/.gitea/workflows/automerge-with-core.yaml +++ b/.gitea/workflows/automerge-with-core.yaml @@ -26,4 +26,5 @@ jobs: upstream_branch: main downstream_repo_url: https://git.sicampus.ru/${{ gitea.repository }} token: ${{ env.TOKEN }} + merge_strategy: rebase spawn_logs: true \ No newline at end of file