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

trying to fix errors like 

cannot lock ref 'refs/heads/master': is at 2d39da4d8d
but expected 596a8ecd11
This commit is contained in:
Martin Diehl 2021-12-07 09:27:24 +01:00
parent 188c199863
commit 722c9828a0
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

@ -208,7 +208,7 @@ update_revision:
- git checkout master - git checkout master
- git pull - git pull
- git merge $UPDATEDREV -s recursive -X ours # conflicts occur only for inconsistent state - git merge $UPDATEDREV -s recursive -X ours # conflicts occur only for inconsistent state
- git push origin master # master is now tested version and has updated VERSION file - git push
- git checkout development - git checkout development
- git pull - git pull
- git merge master -s recursive -X ours -m "[skip ci] Merge branch 'master' into development" # only possible conflict is in VERSION file - git merge master -s recursive -X ours -m "[skip ci] Merge branch 'master' into development" # only possible conflict is in VERSION file