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

---
 .github/workflows/bitbucket-sync-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/bitbucket-sync-test.yml b/.github/workflows/bitbucket-sync-test.yml
index 598d458..bd6fce3 100644
--- a/.github/workflows/bitbucket-sync-test.yml
+++ b/.github/workflows/bitbucket-sync-test.yml
@@ -49,5 +49,5 @@ 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 --rebase upstream main
+        run: git pull --rebase -s recursive -X ours upstream main