develop/rebase-32 -> build/rebase-32

2023-10-23 18:04:06 +00:00 · 2023-10-23 18:04:06 +00:00 · 589c209775
parent db8afa4264
commit 589c209775
1 changed files with 1 additions and 1 deletions
--- a/.gitea/workflows/build->develop.yml
+++ b/.gitea/workflows/build->develop.yml
@ -46,7 +46,7 @@ jobs:
            ls
            git log -5
            git status
-            git rebase origin/master --strategy-option=theirs
+            git rebase -Xtheirs origin/master
            ls
            git log -4
            git status