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

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

diff --git a/.github/workflows/bitbucket-sync.yml b/.github/workflows/bitbucket-sync.yml
index e302427..b156945 100644
--- a/.github/workflows/bitbucket-sync.yml
+++ b/.github/workflows/bitbucket-sync.yml
@@ -49,7 +49,9 @@ 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 ours
+        run: |
+          git checkout --ours .
+          git add .
         
       - name: Git push to other repo
         run: git push upstream