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

---
 .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 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