Merge branch 'delta'
This commit is contained in:
commit
24e0674134
4
Jenkinsfile
vendored
4
Jenkinsfile
vendored
@ -13,10 +13,10 @@ pipeline {
|
||||
branch '**/delta'
|
||||
}
|
||||
steps {
|
||||
sh 'git checkout master'
|
||||
sh 'git checkout live'
|
||||
sh 'git merge --strategy-option theirs origin/delta'
|
||||
sshagent(['359ebf7c-e2b9-45ec-992c-ff8d5549deb6']) {
|
||||
sh 'git push origin master'
|
||||
sh 'git push origin live'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user