diff --git a/Jenkinsfile b/Jenkinsfile index fc67ba1..1bb1943 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ pipeline { branch '**/delta' } 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' sshagent(['359ebf7c-e2b9-45ec-992c-ff8d5549deb6']) { sh 'git push origin master'