From 3ee2387ddf7d948fa31e81536f4bdf5ab30745a7 Mon Sep 17 00:00:00 2001 From: Harrison Deng Date: Thu, 12 May 2022 14:38:00 -0500 Subject: [PATCH] Updated Jenkinsfile. --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1033d39..d8132e8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { steps { sshagent(['108c5045-64d1-42a6-acd7-a39da5e096d1']) { sh "git fetch" - sh "git checkout -b latest-modpack" + sh "git checkout -B latest-modpack" sh "git merge --strategy-option theirs develop" sh "chmod u+x ./scripts/*.sh" sh "./scripts/update_modpack.sh"