Rename resolve import conflicts

src/python/repo.py

@@ -42,7 +42,7 @@
         "gitmerge_recursive_minimal",
         "gitmerge_recursive_histogram",
         "gitmerge_recursive_myers",
-        "gitmerge_resolve",
+        "gitmerge_resolve_import_conflicts",
         "git_hires_merge",
         "spork",
         "intellimerge",

src/scripts/merge_tools/gitmerge_resolve.sh → src/scripts/merge_tools/gitmerge_resolve_import_conflicts.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# usage: ./gitmerge_resolve.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./gitmerge_resolve_import_conflicts.sh <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1

test/small-goal-files/merges_compared/Algorithms.csv

@@ -1,4 +1,4 @@
-idx,branch_name,merge,left,right,notes,two merge tools differ,left_tree_fingerprint,right_tree_fingerprint,gitmerge_ort,gitmerge_ort_run_time,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_run_time,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_run_time,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_run_time,gitmerge_ort_imports_ignorespace_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_run_time,gitmerge_recursive_patience_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_run_time,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_run_time,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_run_time,gitmerge_recursive_myers_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_run_time,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_run_time,git_hires_merge_merge_fingerprint,spork,spork_run_time,spork_merge_fingerprint,intellimerge,intellimerge_run_time,intellimerge_merge_fingerprint
+idx,branch_name,merge,left,right,notes,two merge tools differ,left_tree_fingerprint,right_tree_fingerprint,gitmerge_ort,gitmerge_ort_run_time,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_run_time,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_run_time,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_run_time,gitmerge_ort_imports_ignorespace_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_run_time,gitmerge_recursive_patience_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_run_time,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_run_time,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_run_time,gitmerge_recursive_myers_merge_fingerprint,gitmerge_resolve_import_conflicts,gitmerge_resolve_import_conflicts_run_time,gitmerge_resolve_import_conflicts_merge_fingerprint,git_hires_merge,git_hires_merge_run_time,git_hires_merge_merge_fingerprint,spork,spork_run_time,spork_merge_fingerprint,intellimerge,intellimerge_run_time,intellimerge_merge_fingerprint
 1,refs/heads/master,44ce61beeb8bb5c5c1289db02f1da53f6bff6d8a,e121b3943958ba1558d8828db6f13c632e99f298,58129e828567fac52e821ca147feeab87a95d780,a parent is the base,True,7c30f2d67f153fbbdc9f62b081b97a0934b26589e57098e040802578d268baba,c458f17db71a5030257903364d4572ca7fa357c7465e527dcfd5e7d9a0be90d4,Merge_success,0.022954702377319336,c458f17db71a5030257903364d4572ca7fa357c7465e527dcfd5e7d9a0be90d4,Merge_success,0.023380517959594727,c458f17db71a5030257903364d4572ca7fa357c7465e527dcfd5e7d9a0be90d4,Merge_success,0.02239227294921875,c458f17db71a5030257903364d4572ca7fa357c7465e527dcfd5e7d9a0be90d4,Merge_success,0.031519174575805664,c458f17db71a5030257903364d4572ca7fa357c7465e527dcfd5e7d9a0be90d4,Merge_success,0.031213045120239258,c458f17db71a5030257903364d4572ca7fa357c7465e527dcfd5e7d9a0be90d4,Merge_success,0.02319622039794922,c458f17db71a5030257903364d4572ca7fa357c7465e527dcfd5e7d9a0be90d4,Merge_success,0.02387094497680664,c458f17db71a5030257903364d4572ca7fa357c7465e527dcfd5e7d9a0be90d4,Merge_success,0.023612022399902344,c458f17db71a5030257903364d4572ca7fa357c7465e527dcfd5e7d9a0be90d4,Merge_success,0.02343463897705078,c458f17db71a5030257903364d4572ca7fa357c7465e527dcfd5e7d9a0be90d4,Merge_success,0.022633790969848633,c458f17db71a5030257903364d4572ca7fa357c7465e527dcfd5e7d9a0be90d4,Merge_success,0.018456697463989258,c458f17db71a5030257903364d4572ca7fa357c7465e527dcfd5e7d9a0be90d4,Merge_success,0.03725242614746094,c458f17db71a5030257903364d4572ca7fa357c7465e527dcfd5e7d9a0be90d4,Merge_success,0.48494720458984375,c458f17db71a5030257903364d4572ca7fa357c7465e527dcfd5e7d9a0be90d4
 2,refs/heads/master,e866ae7916d6b763f7d32f72f54edd735b5ea6bc,ae5dac889d19edd6c773e60420f00d4e7177f31f,4342b16e18da9082b32d5b8e9b5b6e3378461ce4,,True,f0e339f59763f214bf0ab37a25e4ba94e2af596db503b73d4388dc2abdde0605,fee471ff366749b92c431eeda17d56aa56701470f3a81f94355c76e798414ab4,Merge_success,0.02874898910522461,35c61417bd77c9ba8ac569d68572d89b78887b3387b00efe57bb5f4bc13299b0,Merge_success,0.028440475463867188,35c61417bd77c9ba8ac569d68572d89b78887b3387b00efe57bb5f4bc13299b0,Merge_success,0.027414560317993164,35c61417bd77c9ba8ac569d68572d89b78887b3387b00efe57bb5f4bc13299b0,Merge_success,0.03650236129760742,35c61417bd77c9ba8ac569d68572d89b78887b3387b00efe57bb5f4bc13299b0,Merge_success,0.034982919692993164,35c61417bd77c9ba8ac569d68572d89b78887b3387b00efe57bb5f4bc13299b0,Merge_success,0.027473926544189453,35c61417bd77c9ba8ac569d68572d89b78887b3387b00efe57bb5f4bc13299b0,Merge_success,0.0276336669921875,35c61417bd77c9ba8ac569d68572d89b78887b3387b00efe57bb5f4bc13299b0,Merge_success,0.027634143829345703,35c61417bd77c9ba8ac569d68572d89b78887b3387b00efe57bb5f4bc13299b0,Merge_success,0.027192354202270508,35c61417bd77c9ba8ac569d68572d89b78887b3387b00efe57bb5f4bc13299b0,Merge_success,0.024461746215820312,35c61417bd77c9ba8ac569d68572d89b78887b3387b00efe57bb5f4bc13299b0,Merge_success,0.024487733840942383,35c61417bd77c9ba8ac569d68572d89b78887b3387b00efe57bb5f4bc13299b0,Merge_success,0.04145383834838867,35c61417bd77c9ba8ac569d68572d89b78887b3387b00efe57bb5f4bc13299b0,Merge_success,0.5257627964019775,35c61417bd77c9ba8ac569d68572d89b78887b3387b00efe57bb5f4bc13299b0
 3,refs/heads/master,ae5dac889d19edd6c773e60420f00d4e7177f31f,38ec459e6f163991c6f88210720dcda4fecc64e8,eb3260404e596031bc9ee037b29bd1fcbb87f625,a parent is the base,True,20bd8c223130349dd809f82f7db86c666542e29cc3b8ccc7bdd5af4f64ca2714,f0e339f59763f214bf0ab37a25e4ba94e2af596db503b73d4388dc2abdde0605,Merge_success,0.023032426834106445,f0e339f59763f214bf0ab37a25e4ba94e2af596db503b73d4388dc2abdde0605,Merge_success,0.02279806137084961,f0e339f59763f214bf0ab37a25e4ba94e2af596db503b73d4388dc2abdde0605,Merge_success,0.02287006378173828,f0e339f59763f214bf0ab37a25e4ba94e2af596db503b73d4388dc2abdde0605,Merge_success,0.030736446380615234,f0e339f59763f214bf0ab37a25e4ba94e2af596db503b73d4388dc2abdde0605,Merge_success,0.029640913009643555,f0e339f59763f214bf0ab37a25e4ba94e2af596db503b73d4388dc2abdde0605,Merge_success,0.021277666091918945,f0e339f59763f214bf0ab37a25e4ba94e2af596db503b73d4388dc2abdde0605,Merge_success,0.023641347885131836,f0e339f59763f214bf0ab37a25e4ba94e2af596db503b73d4388dc2abdde0605,Merge_success,0.0223236083984375,f0e339f59763f214bf0ab37a25e4ba94e2af596db503b73d4388dc2abdde0605,Merge_success,0.022354602813720703,f0e339f59763f214bf0ab37a25e4ba94e2af596db503b73d4388dc2abdde0605,Merge_success,0.022765636444091797,f0e339f59763f214bf0ab37a25e4ba94e2af596db503b73d4388dc2abdde0605,Merge_success,0.021782875061035156,f0e339f59763f214bf0ab37a25e4ba94e2af596db503b73d4388dc2abdde0605,Merge_success,0.034743547439575195,f0e339f59763f214bf0ab37a25e4ba94e2af596db503b73d4388dc2abdde0605,Merge_success,0.46794700622558594,f0e339f59763f214bf0ab37a25e4ba94e2af596db503b73d4388dc2abdde0605

test/small-goal-files/merges_compared/JSCover.csv

@@ -1,4 +1,4 @@
-idx,branch_name,merge,left,right,notes,two merge tools differ,left_tree_fingerprint,right_tree_fingerprint,gitmerge_ort,gitmerge_ort_run_time,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_run_time,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_run_time,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_run_time,gitmerge_ort_imports_ignorespace_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_run_time,gitmerge_recursive_patience_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_run_time,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_run_time,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_run_time,gitmerge_recursive_myers_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_run_time,gitmerge_resolve_merge_fingerprint,git_hires_merge,git_hires_merge_run_time,git_hires_merge_merge_fingerprint,spork,spork_run_time,spork_merge_fingerprint,intellimerge,intellimerge_run_time,intellimerge_merge_fingerprint
+idx,branch_name,merge,left,right,notes,two merge tools differ,left_tree_fingerprint,right_tree_fingerprint,gitmerge_ort,gitmerge_ort_run_time,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_run_time,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_run_time,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_run_time,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_run_time,gitmerge_ort_imports_ignorespace_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_run_time,gitmerge_recursive_patience_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_run_time,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_run_time,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_run_time,gitmerge_recursive_myers_merge_fingerprint,gitmerge_resolve_import_conflicts,gitmerge_resolve_import_conflicts_run_time,gitmerge_resolve_import_conflicts_merge_fingerprint,git_hires_merge,git_hires_merge_run_time,git_hires_merge_merge_fingerprint,spork,spork_run_time,spork_merge_fingerprint,intellimerge,intellimerge_run_time,intellimerge_merge_fingerprint
 1,refs/heads/master,31361bbe2317967a9c47cfc4437e2ce706f79056,fe64f8c1071a356027e49247fd506edc23566c4d,ab9b573de54d1014b5d9822adc9d9e5cf43ba8c0,,True,0964c40e9e97a2e3cf026a5f389c7847d6ebc7c71c7fb515075ab428c093535e,1c33990f3f8a1474d5ce29a9f425e4186fdd951e848a79d18570de9837aa4826,Merge_success,0.034148454666137695,1c33990f3f8a1474d5ce29a9f425e4186fdd951e848a79d18570de9837aa4826,Merge_success,0.036210060119628906,1c33990f3f8a1474d5ce29a9f425e4186fdd951e848a79d18570de9837aa4826,Merge_success,0.034911394119262695,1c33990f3f8a1474d5ce29a9f425e4186fdd951e848a79d18570de9837aa4826,Merge_success,0.06247711181640625,1c33990f3f8a1474d5ce29a9f425e4186fdd951e848a79d18570de9837aa4826,Merge_success,0.06422710418701172,1c33990f3f8a1474d5ce29a9f425e4186fdd951e848a79d18570de9837aa4826,Merge_success,0.03589296340942383,1c33990f3f8a1474d5ce29a9f425e4186fdd951e848a79d18570de9837aa4826,Merge_success,0.0358738899230957,1c33990f3f8a1474d5ce29a9f425e4186fdd951e848a79d18570de9837aa4826,Merge_success,0.035494327545166016,1c33990f3f8a1474d5ce29a9f425e4186fdd951e848a79d18570de9837aa4826,Merge_success,0.03684425354003906,1c33990f3f8a1474d5ce29a9f425e4186fdd951e848a79d18570de9837aa4826,Merge_success,0.03160285949707031,1c33990f3f8a1474d5ce29a9f425e4186fdd951e848a79d18570de9837aa4826,Merge_success,0.03222966194152832,1c33990f3f8a1474d5ce29a9f425e4186fdd951e848a79d18570de9837aa4826,Merge_success,0.04654693603515625,1c33990f3f8a1474d5ce29a9f425e4186fdd951e848a79d18570de9837aa4826,Merge_success,0.5391745567321777,1c33990f3f8a1474d5ce29a9f425e4186fdd951e848a79d18570de9837aa4826
 2,refs/heads/master,fe64f8c1071a356027e49247fd506edc23566c4d,b9ead12fd4a28a9fd7074ad4e97128943b072828,f5cb9ece38b7bd9ae97d7a55490476b84a2336df,a parent is the base,True,5ff8c7cbf214a58896dbca33fafb6940f2a6e19222f5b69d5660ebcf7a63b615,0964c40e9e97a2e3cf026a5f389c7847d6ebc7c71c7fb515075ab428c093535e,Merge_success,0.026674509048461914,0964c40e9e97a2e3cf026a5f389c7847d6ebc7c71c7fb515075ab428c093535e,Merge_success,0.02591681480407715,0964c40e9e97a2e3cf026a5f389c7847d6ebc7c71c7fb515075ab428c093535e,Merge_success,0.0254669189453125,0964c40e9e97a2e3cf026a5f389c7847d6ebc7c71c7fb515075ab428c093535e,Merge_success,0.05698227882385254,0964c40e9e97a2e3cf026a5f389c7847d6ebc7c71c7fb515075ab428c093535e,Merge_success,0.0565798282623291,0964c40e9e97a2e3cf026a5f389c7847d6ebc7c71c7fb515075ab428c093535e,Merge_success,0.02559828758239746,0964c40e9e97a2e3cf026a5f389c7847d6ebc7c71c7fb515075ab428c093535e,Merge_success,0.02802729606628418,0964c40e9e97a2e3cf026a5f389c7847d6ebc7c71c7fb515075ab428c093535e,Merge_success,0.025462865829467773,0964c40e9e97a2e3cf026a5f389c7847d6ebc7c71c7fb515075ab428c093535e,Merge_success,0.028125524520874023,0964c40e9e97a2e3cf026a5f389c7847d6ebc7c71c7fb515075ab428c093535e,Merge_success,0.028583526611328125,0964c40e9e97a2e3cf026a5f389c7847d6ebc7c71c7fb515075ab428c093535e,Merge_success,0.02406620979309082,0964c40e9e97a2e3cf026a5f389c7847d6ebc7c71c7fb515075ab428c093535e,Merge_success,0.04142475128173828,0964c40e9e97a2e3cf026a5f389c7847d6ebc7c71c7fb515075ab428c093535e,Merge_success,0.6363568305969238,0964c40e9e97a2e3cf026a5f389c7847d6ebc7c71c7fb515075ab428c093535e
 3,refs/heads/master,d6f0d1998a8db93117ba9c261d3b35d03633dc59,0eca5983951641b5d0884e6ce8fd162185d0cf05,d686e46aa0582b7dbee1f0d8664d6cb4b56600ec,a parent is the base,True,81fad259714fc7be34c891dcd38697dfcea66a688f159860ad3fc0bc3d7b2c8f,6cc40eab4a213c7640e2ff31e8d1676ee64bcdc32d4ddfa6edae2c86258cb519,Merge_success,0.02791428565979004,6cc40eab4a213c7640e2ff31e8d1676ee64bcdc32d4ddfa6edae2c86258cb519,Merge_success,0.02702927589416504,6cc40eab4a213c7640e2ff31e8d1676ee64bcdc32d4ddfa6edae2c86258cb519,Merge_success,0.027438879013061523,6cc40eab4a213c7640e2ff31e8d1676ee64bcdc32d4ddfa6edae2c86258cb519,Merge_success,0.05590462684631348,6cc40eab4a213c7640e2ff31e8d1676ee64bcdc32d4ddfa6edae2c86258cb519,Merge_success,0.05891680717468262,6cc40eab4a213c7640e2ff31e8d1676ee64bcdc32d4ddfa6edae2c86258cb519,Merge_success,0.02704024314880371,6cc40eab4a213c7640e2ff31e8d1676ee64bcdc32d4ddfa6edae2c86258cb519,Merge_success,0.025490283966064453,6cc40eab4a213c7640e2ff31e8d1676ee64bcdc32d4ddfa6edae2c86258cb519,Merge_success,0.034772396087646484,6cc40eab4a213c7640e2ff31e8d1676ee64bcdc32d4ddfa6edae2c86258cb519,Merge_success,0.038489341735839844,6cc40eab4a213c7640e2ff31e8d1676ee64bcdc32d4ddfa6edae2c86258cb519,Merge_success,0.026692867279052734,6cc40eab4a213c7640e2ff31e8d1676ee64bcdc32d4ddfa6edae2c86258cb519,Merge_success,0.02851557731628418,6cc40eab4a213c7640e2ff31e8d1676ee64bcdc32d4ddfa6edae2c86258cb519,Merge_success,0.04787158966064453,6cc40eab4a213c7640e2ff31e8d1676ee64bcdc32d4ddfa6edae2c86258cb519,Merge_success,0.6995761394500732,6cc40eab4a213c7640e2ff31e8d1676ee64bcdc32d4ddfa6edae2c86258cb519