Fixed command argument typo in pipeline.

2022-05-12 14:27:11 -05:00 · 2022-05-12 14:27:11 -05:00 · 8d00aa9852
commit 8d00aa9852
parent f1c96b02c0
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 develop --theirs"
+                    sh "git merge --strategy-option theirs develop"
                    sh "chmod u+x ./scripts/*.sh"
                    sh "./scripts/update_modpack.sh"
                }