diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml index 2f36d58..e1a3c3d 100644 --- 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