Rebase -Xours

kafkas · Dec 26, 2023 · 07ea339 · 07ea339
1 parent 025d941
commit 07ea339
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml
@@ -32,8 +32,7 @@ jobs:
       - name: Rebase with main branch
         run: |
           git fetch
-          git branch
-          git rebase origin/main
+          git rebase -Xours origin/main
 
       - name: Install dependencies
         run: npm install