223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

pull needed to avoid conflicts

This commit is contained in:
Martin Diehl 2017-04-14 09:16:21 +02:00
parent 4ffca8f0dc
commit a46107ba7f
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab-ci.yml
View File

@ -435,6 +435,7 @@ mergeIntoMaster:
- git merge $UPDATEDREV - git merge $UPDATEDREV
- git push origin master # master is now tested version and has updated VERSION file - git push origin master # master is now tested version and has updated VERSION file
- git checkout development - git checkout development
- git pull
- git merge master -s ours # only possible conflict is in VERSION file - git merge master -s ours # only possible conflict is in VERSION file
- git push origin development # development is unchanged (as master is based on it) but has updated VERSION file - git push origin development # development is unchanged (as master is based on it) but has updated VERSION file
only: only: