Ignore failed merges

benedikt-schesch · May 5, 2024 · c62cba4 · c62cba4
1 parent 65e50eb
commit c62cba4
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/python/replay_merge.py b/src/python/replay_merge.py
@@ -191,7 +191,11 @@ def merge_replay(
                 merge_fingerprint,
             ]
             assert repo.local_repo_path.exists()
-            if (
+            if merge_result not in (
+                MERGE_STATE.Merge_failed,
+                MERGE_STATE.Git_checkout_failed,
+                TEST_STATE.Git_checkout_failed,
+            ) and (
                 merge_data[f"{merge_tool.name}_merge_fingerprint"] != merge_fingerprint
                 and not dont_check_fingerprints
             ):