Skip to content
Snippets Groups Projects
Commit d0889bda authored by Martin Hamerník's avatar Martin Hamerník
Browse files

fix git merge conflict in failed CI pipeline

parent 22e3f59b
No related branches found
No related tags found
No related merge requests found
......@@ -68,8 +68,10 @@ editVersionAndDeploy:
- git config --global user.email "$GIT_SERVICE_USER_EMAIL"
- git config --global user.name "$GIT_SERVICE_USER_NAME"
- git remote set-url origin "$REPOSITORY_SSH_URL"
- git fetch
- git checkout master]
- git stash
- git pull
- git checkout master
script:
- npm run ci-update-version
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment