From 92277f3abbdaf566dffb7b9b3ea11b423d766da2 Mon Sep 17 00:00:00 2001
From: GuillaumeFalourd <guillaume.falourd@zup.com.br>
Date: Thu, 6 Jan 2022 23:41:45 -0300
Subject: [PATCH] update git push to remote action

Signed-off-by: GuillaumeFalourd <guillaume.falourd@zup.com.br>
---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index ee33527..8b4d6ed 100644
--- a/action.yml
+++ b/action.yml
@@ -91,7 +91,7 @@ runs:
           git branch push-and-commit-action-${{ github.run_id }}-${{ github.job }}
           git fetch "${{ inputs.remote_repository }}" "$CURRENT_BRANCH"
           git checkout "$CURRENT_BRANCH"
-          git merge push-and-commit-action-${{ github.run_id }}-${{ github.job }}
+          git merge -X ours push-and-commit-action-${{ github.run_id }}-${{ github.job }}
           git branch -d push-and-commit-action-${{ github.run_id }}-${{ github.job }}
 
           git push "${{ inputs.remote_repository }}" "$CURRENT_BRANCH:$TARGET_BRANCH" --follow-tags $FORCE $TAGS