diff --git a/src/main/java/GTNHNightlyUpdater/ConfigUpdater.java b/src/main/java/GTNHNightlyUpdater/ConfigUpdater.java index b41f852..96c29e2 100644 --- 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())); }