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

2024-03-09 15:10:37 +00:00
parent 33d01a6a2c
commit f9a8002c6e
1 changed files with 1 additions and 0 deletions
--- 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