From dd9cc6f8b991c4f397e885d6bb8e4339005981f3 Mon Sep 17 00:00:00 2001
From: Harrison Deng <yunyangdeng@gmail.com>
Date: Fri, 13 May 2022 03:40:45 -0500
Subject: [PATCH] Updated Jenkinsfile.

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 434efdf..c845911 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -35,6 +35,7 @@ pipeline {
                 branch '**/sync-modpack'
             }
             steps {
+                sh "git merge -X theirs sync-modpack"
                 sh "git add mods/**"
                 sh "git add config/**"
                 sh "git clean -dfX"