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

2024-03-04 19:45:55 +00:00 · 2024-03-04 19:45:55 +00:00 · 44add8a222
commit 44add8a222
parent 1985893324
1 changed files with 1 additions and 1 deletions
--- a/.gitea/workflows/automerge-with-core.yaml
+++ b/.gitea/workflows/automerge-with-core.yaml
@ -25,7 +25,7 @@ jobs:
          git fetch upstream
      - run: |
          cd /repo
-          git rebase upstream/main
+          git rebase upstream/main -s ours
      - run: |
          cd /repo
          git log