From 6e11f4ab6bbb79b55390991713ea8b8a7dbbcfde Mon Sep 17 00:00:00 2001
From: cato <47259183+cato447@users.noreply.github.com>
Date: Sun, 5 Jun 2022 21:08:19 +0200
Subject: [PATCH] updated rebase behavior

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

diff --git a/.github/workflows/bitbucket-sync.yml b/.github/workflows/bitbucket-sync.yml
index fdc52fd..9406844 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 --rebase upstream main
+        run: git pull --rebase -X ours
         
       - name: Git push to other repo
         run: git push upstream