ydeng/rsemcs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/delta'

Browse Source
This commit is contained in:
Jenkins 2022-01-20 03:21:46 -06:00
commit 4977db796f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -13,7 +13,7 @@ pipeline {
branch '**/delta' branch '**/delta'
} }
steps { steps {
checkout([$class: 'GitSCM', branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[credentialsId: '359ebf7c-e2b9-45ec-992c-ff8d5549deb6', url: 'git@dev.sys.reslate.xyz:ydeng/rsemcs.git']]]) sh 'git checkout master'
sh 'git merge --strategy-option theirs origin/delta' sh 'git merge --strategy-option theirs origin/delta'
sshagent(['359ebf7c-e2b9-45ec-992c-ff8d5549deb6']) { sshagent(['359ebf7c-e2b9-45ec-992c-ff8d5549deb6']) {
sh 'git push origin master' sh 'git push origin master'