Greedy Expansion

benedikt-schesch · Feb 14, 2025 · 6e760e0 · 6e760e0
1 parent 2a26500
commit 6e760e0
Show file tree

Hide file tree

Showing 45 changed files with 576 additions and 522 deletions.
diff --git a/results/combined_sampled_50/defs.tex b/results/combined_sampled_50/defs.tex
@@ -16,7 +16,7 @@
 
 % Results
 \def\combinedSampled50AverageTriesUntilPass{1.0\xspace}
-\def\combinedSampled50NumberofMergesWith1TriesUntilPass{102\xspace}
+\def\combinedSampled50NumberofMergesWith1TriesUntilPass{100\xspace}
 \def\combinedSampled50SporkOverOrtCorrect{5\xspace}
 \def\combinedSampled50SporkOverOrtIncorrect{3\xspace}
 \def\combinedSampled50MainBranchMerges{11\xspace}

diff --git a/results/combined_sampled_50/merges_analyzer_histograms.pdf b/results/combined_sampled_50/merges_analyzer_histograms.pdf
diff --git a/results/combined_sampled_50/merges_tested/apache/commons-math.csv b/results/combined_sampled_50/merges_tested/apache/commons-math.csv
@@ -1,2 +1,2 @@
 idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,mergiraf,mergiraf_merge_fingerprint,deepseekr1_merge,deepseekr1_merge_merge_fingerprint,o3_mini_high_merge,o3_mini_high_merge_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,mergiraf_plus,mergiraf_plus_merge_fingerprint,deepseekr1_merge_plus,deepseekr1_merge_plus_merge_fingerprint,o3_mini_high_merge_plus,o3_mini_high_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint
-118,refs/remotes/origin/h10-builds,a6804eaa74dd04734bac4081d16fc058030dce13,809ce8a30485e65a792674692a8dd66b60c48d98,175d7a1242f98ec9c2da23608bc0fd503a837ad1,,True,True,Tests_passed,3bd30ff2e49530c3187ef7afb9d8ba6a4cf5a7dd29b4e099eb719a1f1cc71e48,True,35,188,801,5,True,Tests_passed,1d703ebe29992ba38201e018610faaaebae889d3fbaf1da70811acb308428a1d,True,35,True,Merge_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Merge_failed,8573318dfe5a9eeab4a609c31935c18a477bb20638187d833fc8ee64bc659f4f,Merge_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Merge_failed,4ae42fdd8785a81e259e80abc209b6c5a221ceb0aed92cfdcd5ec552d1fae23c,Merge_failed,cafc4d583023a6daf5bba8eafb4ba33496c72f4c6fe4d8413c723a084157a2c9,Merge_failed,cafc4d583023a6daf5bba8eafb4ba33496c72f4c6fe4d8413c723a084157a2c9,Merge_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Merge_failed,c7c52680521055855e2d7da569bc770e485f759448a9863404d65ef128220c5a,Merge_failed,1b258f3b99e4c488b68d5933dfdf70afd92c3eb65e7df12e58169334f24bb1c4,Merge_failed,6cdcb06326f6e5c79d2de1a6de9f08d96e867dd0d7fe30126b8f9d1e8856f4f0,Merge_failed,aff008b4054ced71df18c1a65bb4bd3d15b6cada0bdad899357f4fb489089e1e,Tests_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Tests_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Tests_failed,ab0797bb0f9d26546ab6cd5d029e86de0e89e538a0e6164c7c5ecfaddbbeb62d,Merge_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Merge_failed,427f6ee7a708c895190568ac55b56915986ea1d450673d0a53b2bd0854499b9a,Merge_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Merge_failed,427f6ee7a708c895190568ac55b56915986ea1d450673d0a53b2bd0854499b9a,Merge_failed,75b6890b384cbfc3fba1e42b5e4107ecd2b7f7a9874a175077d43de7bd3aee59,Merge_failed,427f6ee7a708c895190568ac55b56915986ea1d450673d0a53b2bd0854499b9a,Merge_failed,75b6890b384cbfc3fba1e42b5e4107ecd2b7f7a9874a175077d43de7bd3aee59,Merge_failed,427f6ee7a708c895190568ac55b56915986ea1d450673d0a53b2bd0854499b9a,Merge_failed,4c6969abfad7bdc6b46110e9752fad2d81e3d051c9042bb8888bdc0eb16af9b5,Merge_failed,4351308e1d538943cba53a599611e4027beb8ec8a5c7654c86567b252696b2cb,Merge_failed,4351308e1d538943cba53a599611e4027beb8ec8a5c7654c86567b252696b2cb,Merge_failed,427f6ee7a708c895190568ac55b56915986ea1d450673d0a53b2bd0854499b9a,Merge_failed,83c06ef372cea429d77591a811395ce345bd15efa6e9d283c4c8d1363ffc9767,Merge_failed,8f93d6b182ffb678842fcf6b4ab73c13c7062bc84ce8a4b6a14001d3bcc88b4c,Merge_failed,75ce8ae405d65eb2c50dff647941e4370e2419df17c1e87f147548a9edf85d4e,Merge_failed,b74fd844cd9d9d71e85032fdcc73360c389e7bcb4df46755237b3f8ea2380277,Merge_failed,427f6ee7a708c895190568ac55b56915986ea1d450673d0a53b2bd0854499b9a,Merge_failed,427f6ee7a708c895190568ac55b56915986ea1d450673d0a53b2bd0854499b9a,Tests_failed,496e8823ac1b95f1dc7ce8ad659c48d2d594a39452dfe0d5404d07c7052ef1c0,Merge_failed,427f6ee7a708c895190568ac55b56915986ea1d450673d0a53b2bd0854499b9a,Merge_failed,427f6ee7a708c895190568ac55b56915986ea1d450673d0a53b2bd0854499b9a,Merge_failed,427f6ee7a708c895190568ac55b56915986ea1d450673d0a53b2bd0854499b9a,Merge_failed,427f6ee7a708c895190568ac55b56915986ea1d450673d0a53b2bd0854499b9a,Merge_failed,75b6890b384cbfc3fba1e42b5e4107ecd2b7f7a9874a175077d43de7bd3aee59
+118,refs/remotes/origin/h10-builds,a6804eaa74dd04734bac4081d16fc058030dce13,809ce8a30485e65a792674692a8dd66b60c48d98,175d7a1242f98ec9c2da23608bc0fd503a837ad1,,True,True,Tests_passed,3bd30ff2e49530c3187ef7afb9d8ba6a4cf5a7dd29b4e099eb719a1f1cc71e48,True,35,188,801,5,True,Tests_passed,1d703ebe29992ba38201e018610faaaebae889d3fbaf1da70811acb308428a1d,True,35,True,Merge_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Merge_failed,8573318dfe5a9eeab4a609c31935c18a477bb20638187d833fc8ee64bc659f4f,Merge_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Merge_failed,4ae42fdd8785a81e259e80abc209b6c5a221ceb0aed92cfdcd5ec552d1fae23c,Merge_failed,cafc4d583023a6daf5bba8eafb4ba33496c72f4c6fe4d8413c723a084157a2c9,Merge_failed,cafc4d583023a6daf5bba8eafb4ba33496c72f4c6fe4d8413c723a084157a2c9,Merge_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Merge_failed,c7c52680521055855e2d7da569bc770e485f759448a9863404d65ef128220c5a,Merge_failed,1b258f3b99e4c488b68d5933dfdf70afd92c3eb65e7df12e58169334f24bb1c4,Merge_failed,6cdcb06326f6e5c79d2de1a6de9f08d96e867dd0d7fe30126b8f9d1e8856f4f0,Merge_failed,aff008b4054ced71df18c1a65bb4bd3d15b6cada0bdad899357f4fb489089e1e,Tests_failed,f340874c5e662a2e627d463ec25a13f4ba3dccaee3f7b26313257f0745041787,Tests_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Tests_failed,ab0797bb0f9d26546ab6cd5d029e86de0e89e538a0e6164c7c5ecfaddbbeb62d,Merge_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Merge_failed,427f6ee7a708c895190568ac55b56915986ea1d450673d0a53b2bd0854499b9a,Merge_failed,f7379654ac09588860eab9e2f6c77fbe0b074d43d9ed9d9f5bbabce3120794b4,Merge_failed,427f6ee7a708c895190568ac55b56915986ea1d450673d0a53b2bd0854499b9a,Merge_failed,75b6890b384cbfc3fba1e42b5e4107ecd2b7f7a9874a175077d43de7bd3aee59,Merge_failed,427f6ee7a708c895190568ac55b56915986ea1d450673d0a53b2bd0854499b9a,Merge_failed,75b6890b384cbfc3fba1e42b5e4107ecd2b7f7a9874a175077d43de7bd3aee59,Merge_failed,427f6ee7a708c895190568ac55b56915986ea1d450673d0a53b2bd0854499b9a,Merge_failed,4c6969abfad7bdc6b46110e9752fad2d81e3d051c9042bb8888bdc0eb16af9b5,Merge_failed,4351308e1d538943cba53a599611e4027beb8ec8a5c7654c86567b252696b2cb,Merge_failed,4351308e1d538943cba53a599611e4027beb8ec8a5c7654c86567b252696b2cb,Merge_failed,427f6ee7a708c895190568ac55b56915986ea1d450673d0a53b2bd0854499b9a,Merge_failed,83c06ef372cea429d77591a811395ce345bd15efa6e9d283c4c8d1363ffc9767,Merge_failed,8f93d6b182ffb678842fcf6b4ab73c13c7062bc84ce8a4b6a14001d3bcc88b4c,Merge_failed,75ce8ae405d65eb2c50dff647941e4370e2419df17c1e87f147548a9edf85d4e,Merge_failed,b74fd844cd9d9d71e85032fdcc73360c389e7bcb4df46755237b3f8ea2380277,Tests_failed,07b0c2956b59d89ab8400e0b25ea35b4e521ddab6ba1ba72ad92b18ab4a96cf5,Merge_failed,427f6ee7a708c895190568ac55b56915986ea1d450673d0a53b2bd0854499b9a,Tests_failed,496e8823ac1b95f1dc7ce8ad659c48d2d594a39452dfe0d5404d07c7052ef1c0,Merge_failed,427f6ee7a708c895190568ac55b56915986ea1d450673d0a53b2bd0854499b9a,Merge_failed,427f6ee7a708c895190568ac55b56915986ea1d450673d0a53b2bd0854499b9a,Merge_failed,427f6ee7a708c895190568ac55b56915986ea1d450673d0a53b2bd0854499b9a,Merge_failed,427f6ee7a708c895190568ac55b56915986ea1d450673d0a53b2bd0854499b9a,Merge_failed,75b6890b384cbfc3fba1e42b5e4107ecd2b7f7a9874a175077d43de7bd3aee59
diff --git a/results/combined_sampled_50/merges_tested/apache/maven-plugin-tools.csv b/results/combined_sampled_50/merges_tested/apache/maven-plugin-tools.csv
@@ -1,2 +1,2 @@
 idx,branch_name,merge,left,right,notes,diff contains java file,imports_involved,left parent test result,left_tree_fingerprint,non_java_involved,num_diff_files,num_diff_hunks,num_diff_lines,num_intersecting_files,parents pass,right parent test result,right_tree_fingerprint,test merge,union_diff_files,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers_ignorespace,gitmerge_recursive_myers_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,mergiraf,mergiraf_merge_fingerprint,deepseekr1_merge,deepseekr1_merge_merge_fingerprint,o3_mini_high_merge,o3_mini_high_merge_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint,adjacent,adjacent_merge_fingerprint,imports,imports_merge_fingerprint,version_numbers,version_numbers_merge_fingerprint,ivn,ivn_merge_fingerprint,ivn_ignorespace,ivn_ignorespace_merge_fingerprint,gitmerge_ort_plus,gitmerge_ort_plus_merge_fingerprint,gitmerge_ort_ignorespace_plus,gitmerge_ort_ignorespace_plus_merge_fingerprint,gitmerge_recursive_histogram_plus,gitmerge_recursive_histogram_plus_merge_fingerprint,gitmerge_recursive_myers_ignorespace_plus,gitmerge_recursive_myers_ignorespace_plus_merge_fingerprint,gitmerge_recursive_minimal_plus,gitmerge_recursive_minimal_plus_merge_fingerprint,gitmerge_recursive_myers_plus,gitmerge_recursive_myers_plus_merge_fingerprint,gitmerge_recursive_patience_plus,gitmerge_recursive_patience_plus_merge_fingerprint,gitmerge_resolve_plus,gitmerge_resolve_plus_merge_fingerprint,git_hires_merge_plus,git_hires_merge_plus_merge_fingerprint,spork_plus,spork_plus_merge_fingerprint,mergiraf_plus,mergiraf_plus_merge_fingerprint,deepseekr1_merge_plus,deepseekr1_merge_plus_merge_fingerprint,o3_mini_high_merge_plus,o3_mini_high_merge_plus_merge_fingerprint,intellimerge_plus,intellimerge_plus_merge_fingerprint,adjacent_plus,adjacent_plus_merge_fingerprint,imports_plus,imports_plus_merge_fingerprint,version_numbers_plus,version_numbers_plus_merge_fingerprint,ivn_plus,ivn_plus_merge_fingerprint,ivn_ignorespace_plus,ivn_ignorespace_plus_merge_fingerprint
-18,refs/remotes/origin/pull/56,a859f5f2e195188a00c1af3b6ea86f3d5582f92f,85b7905d4edb8fc64a2aa129459a2f49f9da4c3a,95f76d2b303c15de01bbb29e3d1a16db4595e44c,,True,False,Tests_passed,84bddc5d5d99cd4b5388c925218f369ee755568371093cba2e166f058def7ec5,True,3,12,47,2,True,Tests_passed,026707d95189b6d2a29ee81e849a7d7823ac2553e546b972244082977c959eb7,True,3,True,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,24809d4351cae94e7f35bcb69997073875019aaf838d710d7aa2d57a40e178c5,Merge_failed,8947e42715586332c4cf588a69b60951aa42eca36e5b5df04559a34a3a4d2238,Merge_failed,6860e538ccba5484d6494c7645c2f4fb9a50adb5f4dcf54746e4e94b53716922,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Tests_failed,ce0059fe7096aba2999f256a3182fa5e61c2268bbec06573feea3d17c259fe28,Tests_failed,64ec5d5aec7e6cf0d22d39b4490903761ea9f05a3850b60a64c9bf9ea700ea62,Tests_failed,d8cc62ce590b476121ee1f5c794026b61a4bc2b0af2ab7cce5ebd54bcdba0ff6,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,791258497484c3c851d24d4e3a03cb19a8977d46a09a68f04fada072ce7a04ab,Merge_failed,8947e42715586332c4cf588a69b60951aa42eca36e5b5df04559a34a3a4d2238,Merge_failed,6860e538ccba5484d6494c7645c2f4fb9a50adb5f4dcf54746e4e94b53716922,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Tests_failed,ce0059fe7096aba2999f256a3182fa5e61c2268bbec06573feea3d17c259fe28,Tests_failed,64ec5d5aec7e6cf0d22d39b4490903761ea9f05a3850b60a64c9bf9ea700ea62,Tests_failed,d8cc62ce590b476121ee1f5c794026b61a4bc2b0af2ab7cce5ebd54bcdba0ff6,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b
+18,refs/remotes/origin/pull/56,a859f5f2e195188a00c1af3b6ea86f3d5582f92f,85b7905d4edb8fc64a2aa129459a2f49f9da4c3a,95f76d2b303c15de01bbb29e3d1a16db4595e44c,,True,False,Tests_passed,84bddc5d5d99cd4b5388c925218f369ee755568371093cba2e166f058def7ec5,True,3,12,47,2,True,Tests_passed,026707d95189b6d2a29ee81e849a7d7823ac2553e546b972244082977c959eb7,True,3,True,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,24809d4351cae94e7f35bcb69997073875019aaf838d710d7aa2d57a40e178c5,Merge_failed,8947e42715586332c4cf588a69b60951aa42eca36e5b5df04559a34a3a4d2238,Merge_failed,6860e538ccba5484d6494c7645c2f4fb9a50adb5f4dcf54746e4e94b53716922,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Tests_failed,cb5acc23b5cbcede30a78321df1b0c650c662e3307fa0569b0c0ce9163b3ef6b,Tests_failed,cb5acc23b5cbcede30a78321df1b0c650c662e3307fa0569b0c0ce9163b3ef6b,Tests_failed,d8cc62ce590b476121ee1f5c794026b61a4bc2b0af2ab7cce5ebd54bcdba0ff6,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,791258497484c3c851d24d4e3a03cb19a8977d46a09a68f04fada072ce7a04ab,Merge_failed,8947e42715586332c4cf588a69b60951aa42eca36e5b5df04559a34a3a4d2238,Merge_failed,6860e538ccba5484d6494c7645c2f4fb9a50adb5f4dcf54746e4e94b53716922,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Tests_failed,cb5acc23b5cbcede30a78321df1b0c650c662e3307fa0569b0c0ce9163b3ef6b,Tests_failed,cb5acc23b5cbcede30a78321df1b0c650c662e3307fa0569b0c0ce9163b3ef6b,Tests_failed,d8cc62ce590b476121ee1f5c794026b61a4bc2b0af2ab7cce5ebd54bcdba0ff6,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b,Merge_failed,e0f28e30a0bc1de97ce1e1a9de44a3339d215a1711a1b894d24769e9bf511d4b