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

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 0f0ef59..185ec3f 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 develop"
+                    sh "git merge --strategy-option theirs origin/develop"
                     sh "chmod u+x ./scripts/*.sh"
                     sh "./scripts/update_modpack.sh"
                 }