Updated Jenkinsfile.

2022-05-13 03:40:45 -05:00 · 2022-05-13 03:40:45 -05:00 · dd9cc6f8b9
commit dd9cc6f8b9
parent bf8fdaaddc
1 changed files with 1 additions and 0 deletions
--- a/1
+++ b/1
@ -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"