From 88d3ada2fe983532a98f18f7c2d2d402253495c6 Mon Sep 17 00:00:00 2001 From: Harrison Deng Date: Thu, 12 May 2022 15:12:45 -0500 Subject: [PATCH] Updated Jenkinsfile. --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9c84bae..14ca771 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,7 +35,7 @@ pipeline { sh "git add config/**" sh "git commit -a -m 'Automatic integration of latest modpack.' && exit 0" sshagent(['108c5045-64d1-42a6-acd7-a39da5e096d1']) { - sh "git pull -X theirs" + sh "git pull -X theirs origin latest-modpack" sh "git push --set-upstream origin latest-modpack" } sh "git checkout develop"