Skip to content
Snippets Groups Projects
Commit 14460732 authored by julenalbi's avatar julenalbi
Browse files

merge use theirs

parent 4c68c432
No related branches found
No related tags found
No related merge requests found
...@@ -23,7 +23,7 @@ update: ...@@ -23,7 +23,7 @@ update:
- git checkout ${branch} - git checkout ${branch}
- git pull - git pull
- git branch --set-upstream-to=origin/${branch} ${branch} - 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 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} - 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 - node package-version-updater/updateGitlabSide.js --cV $current_version --nV $next_version -p $CI_PROJECT_ID -t $access_token
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment