From e13961d150da0e127d58752176d705810ff90d11 Mon Sep 17 00:00:00 2001
From: cato <47259183+cato447@users.noreply.github.com>
Date: Mon, 6 Jun 2022 01:57:24 +0200
Subject: [PATCH] Update bitbucket-sync.yml

---
 .github/workflows/bitbucket-sync.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/bitbucket-sync.yml b/.github/workflows/bitbucket-sync.yml
index 3f5e727..6660eaa 100644
--- a/.github/workflows/bitbucket-sync.yml
+++ b/.github/workflows/bitbucket-sync.yml
@@ -49,9 +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 checkout --theirs .
-          git add .
+        run: git pull -s recursive -X ours upstream main
         
       - name: Git push to other repo
         run: git push upstream