Обновить .gitea/workflows/automerge-with-core.yaml
This commit is contained in:
1 parent
1985893324
commit
44add8a222
1 file changed
+1
-1
@@ -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
|
||||
|
||||
Reference in new issue
Block a user