diff --git a/Jenkinsfile b/Jenkinsfile index 77480a5..3a76151 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { steps { sshagent(['eb018bad-5d56-4306-a006-60fb7cf194aa']) { sh "git fetch" - sh "git checkout -B origin/develop" + sh "git checkout origin/develop" sh "git merge -X theirs origin/sync-modpack" sh "chmod u+x ./scripts/*.sh" sh "./scripts/update_modpack.sh" @@ -41,7 +41,7 @@ pipeline { sh "git commit -a -m 'Automatic integration of latest modpack.' && exit 0" sshagent(['108c5045-64d1-42a6-acd7-a39da5e096d1']) { sh "git pull -X theirs origin develop" - sh "git push --set-upstream origin develop" + sh "git push --set-upstream origin origin/develop" } } }