Use 'known-merge' for resolving conflicts when updating projects.

jaraco · Nov 10, 2022 · 6eb12f1 · 6eb12f1
1 parent 2f728c0
commit 6eb12f1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/jaraco/develop/update-projects.py b/jaraco/develop/update-projects.py
@@ -34,7 +34,7 @@ def update_project(name):
         proc = subprocess.Popen(['git', 'pull', 'gh://jaraco/skeleton', '--no-edit'])
         code = proc.wait()
         if code:
-            subprocess.check_call(['git', 'mergetool'])
+            subprocess.check_call(['git', 'mergetool', '-t', 'known-merge'])
             subprocess.check_call(['git', 'commit', '--no-edit'])
         subprocess.check_call(['git', 'push'])