diff --git a/.github/workflows/bitbucket-sync.yml b/.github/workflows/bitbucket-sync.yml index b156945..3f5e727 100644 --- a/.github/workflows/bitbucket-sync.yml +++ b/.github/workflows/bitbucket-sync.yml @@ -50,7 +50,7 @@ jobs: - name: Fix merge conflicts if any run: | - git checkout --ours . + git checkout --theirs . git add . - name: Git push to other repo