Merge remote-tracking branch 'origin/delta'

2022-01-20 03:21:46 -06:00 · 2022-01-20 03:21:46 -06:00 · 4977db796f
commit 4977db796f
parent 935cc3d6a7 3dd0b4cd0f
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -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'