diff --git a/.github/workflows/bitbucket-sync.yml b/.github/workflows/bitbucket-sync.yml index 1815134..e302427 100644 --- 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