From 873ff15abe7edba7de037b1668b011f8f51e3dc2 Mon Sep 17 00:00:00 2001 From: cato <47259183+cato447@users.noreply.github.com> Date: Mon, 6 Jun 2022 01:58:46 +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 6660eaa..ff655c0 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 -s recursive -X ours upstream main + run: git pull --rebase -s recursive -X ours upstream main - name: Git push to other repo run: git push upstream