From 8bbec1a94f648425652634bcf6ca1d7cd9ed2494 Mon Sep 17 00:00:00 2001
From: Harrison Deng <yunyangdeng@gmail.com>
Date: Thu, 12 May 2022 14:58:54 -0500
Subject: [PATCH] Updated Jenkinsfile.

---
 Jenkinsfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 185ec3f..9c84bae 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 --strategy-option theirs origin/develop"
+                    sh "git merge -X theirs origin/develop"
                     sh "chmod u+x ./scripts/*.sh"
                     sh "./scripts/update_modpack.sh"
                 }
@@ -35,6 +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 push --set-upstream origin latest-modpack"
                 }
                 sh "git checkout develop"