Updated Jenkinsfile.

2022-05-12 14:45:36 -05:00
parent 6995431524
commit ffe9eb3955
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@@ -9,7 +9,7 @@ pipeline {
                sshagent(['108c5045-64d1-42a6-acd7-a39da5e096d1']) {
                    sh "git fetch"
                    sh "git checkout -B latest-modpack"
-                    sh "git merge --strategy-option theirs develop"
+                    sh "git merge --strategy-option theirs origin/develop"
                    sh "chmod u+x ./scripts/*.sh"
                    sh "./scripts/update_modpack.sh"
                }