diff --git a/Jenkinsfile b/Jenkinsfile index 48693ac..1033d39 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ pipeline { sshagent(['108c5045-64d1-42a6-acd7-a39da5e096d1']) { sh "git fetch" sh "git checkout -b latest-modpack" - sh "git merge develop --theirs" + sh "git merge --strategy-option theirs develop" sh "chmod u+x ./scripts/*.sh" sh "./scripts/update_modpack.sh" }