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

Merge branch 'development' into PRIVATEasSubmodule

This commit is contained in:
Martin Diehl 2017-04-18 05:42:27 +02:00
parent c58dd6279d 1768d8f103
commit 2c28d059b5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -436,7 +436,7 @@ mergeIntoMaster:
- 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 pull
- git merge master -s ours # only possible conflict is in VERSION file - git merge master -s ours -m "[skip ci] Merge branch 'master' into development" # 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:
- development - development