Update Jenkinsfile

azatsafin · web-flow · commit f6253b6bfaa2 · 2020-10-30T17:42:38.000+03:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -66,7 +66,7 @@ spec:
                 expression { return env.GIT_BRANCH == 'master'; }
             }
             steps {
-                sh 'git merge master'
+                sh 'git merge origin/master'
             }
         }
         stage('Remove SNAPSHOT from version') {

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ spec:`
`66`	`66`	`expression { return env.GIT_BRANCH == 'master'; }`
`67`	`67`	`}`
`68`	`68`	`steps {`
`69`		`- sh 'git merge master'`
	`69`	`+ sh 'git merge origin/master'`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`	`stage('Remove SNAPSHOT from version') {`