From c62cba45ea7920352bead1a5be85d48e0876bdaf Mon Sep 17 00:00:00 2001 From: Benedikt Schesch Date: Sun, 5 May 2024 14:53:32 -0700 Subject: [PATCH] Ignore failed merges --- src/python/replay_merge.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/python/replay_merge.py b/src/python/replay_merge.py index a1d5c2042f..40acac2f70 100755 --- 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 ):