Try to merge recursively and patiently

c3f19871 · Lin Jen-Shin · 6dc60935 · c3f19871
Commit c3f19871 authored May 16, 2018 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

scripts/ee_specific_check/ee_specific_check.rb scripts/ee_specific_check/ee_specific_check.rb +1 -1

No files found.
--- a/scripts/ee_specific_check/ee_specific_check.rb
+++ b/scripts/ee_specific_check/ee_specific_check.rb
@@ -231,7 +231,7 @@ module EESpecificCheck

  def find_forward_ce_head(ce_merge_base, ce_fetch_head)
    with_detached_head(ce_fetch_head) do
-      run_git_command("merge #{ce_merge_base}")
+      run_git_command("merge #{ce_merge_base} -s recursive -X patience")

      status = git_status