Method: FlashFlow::Resolve#start

Defined in:
lib/flash_flow/resolve.rb

#start ⇒ Object 



23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
 
# File 'lib/flash_flow/resolve.rb', line 23

def start
  check_for_conflict

  in_working_branch do
    merge_conflicted

    if unresolved_conflicts.empty?
      puts "You have already resolved all conflicts."
    else
      launch_bash

      rerere

      unless unresolved_conflicts.empty?
        puts "There are still unresolved conflicts in these files:\n#{unresolved_conflicts.join("\n")}\n\n"
      end
    end

    git_reset
  end
end