updated rebase behavior

2022-06-05 21:08:19 +02:00
parent 4b1455cf6b
commit 6e11f4ab6b
1 changed files with 1 additions and 1 deletions
--- a/.github/workflows/bitbucket-sync.yml
+++ b/.github/workflows/bitbucket-sync.yml
@@ -49,7 +49,7 @@ jobs:
        run: git config --global user.email "organisation-name@github.com" && git config --global user.name "GitHub Action Runner"
      
      - name: Fix merge conflicts if any
-        run: git pull --rebase upstream main
+        run: git pull --rebase -X ours
        
      - name: Git push to other repo
        run: git push upstream