From 1446073209a0cec6f500f4a84131b70f39dd35b3 Mon Sep 17 00:00:00 2001
From: julenalbi <julenalbizuri3@gmail.com>
Date: Wed, 23 Mar 2022 10:29:34 +0100
Subject: [PATCH] merge use theirs
---
stack-updater/stack_updater.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/stack-updater/stack_updater.yml b/stack-updater/stack_updater.yml
index 51d3d05..d17862a 100644
--- a/stack-updater/stack_updater.yml
+++ b/stack-updater/stack_updater.yml
@@ -23,7 +23,7 @@ update:
- git checkout ${branch}
- git pull
- git branch --set-upstream-to=origin/${branch} ${branch}
- - git merge -s ours $current_version
+ - git merge -X theirs $current_version
- git remote rm origin && git remote add origin "https://${access_token_name}:${access_token}@git.code.tecnalia.com/${CI_PROJECT_PATH}.git"
- git push --follow-tags --set-upstream origin ${branch}
- node package-version-updater/updateGitlabSide.js --cV $current_version --nV $next_version -p $CI_PROJECT_ID -t $access_token
--
GitLab