--ours -> -Xours

SciNim · Apr 8, 2021 · 7aadb37 · 7aadb37
1 parent 7ffb5b5
commit 7aadb37
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Fetch
         run: git fetch
       - name: Rebase
-        run: git rebase origin/master --ours
+        run: git rebase -Xours origin/master
       - name: Gendoc
         run: nimble gendoc
       - name: Commit files