quiet the merge output (#10)

GTNewHorizons · Feb 8, 2025 · 82c502a · 82c502a
1 parent a53fd08
commit 82c502a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/GTNHNightlyUpdater/ConfigUpdater.java b/src/main/java/GTNHNightlyUpdater/ConfigUpdater.java
@@ -123,7 +123,7 @@ private void mergeChanges(File packConfigsDir) throws IOException {
         runCommand("git", "-C", packConfigsDir.getAbsolutePath(), "fetch");
         try {
             // Merge remote changes into local branch
-            runCommand("git", "-C", packConfigsDir.getAbsolutePath(), "merge", "-X", "theirs", configTag != null ? configTag : "origin/master");
+            runCommand("git", "-C", packConfigsDir.getAbsolutePath(), "merge", "--no-stat", "--no-edit", "-X", "theirs", configTag != null ? configTag : "origin/master");
         } catch (RuntimeException e) {
             throw new RuntimeException(String.format("There are conflicts that need to be resolved manually. Please check the repo at [%s]", packConfigsDir.getAbsolutePath()));
         }