Update bitbucket-sync.yml

2022-06-06 01:38:13 +02:00
parent 97bd773640
commit 2167298da1
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 -X theirs
+        run: git pull -X ours
        
      - name: Git push to other repo
        run: git push upstream