Class: Merge::Resolve

Inherits:
Object
  • Object
show all
Defined in:
lib/merge/resolve.rb

Instance Method Summary collapse

Constructor Details

#initialize(repository, inputs) ⇒ Resolve

Returns a new instance of Resolve.



6
7
8
9
10
11
 
# File 'lib/merge/resolve.rb', line 6

def initialize(repository, inputs)
  @repo   = repository
  @inputs = inputs

  @on_progress = nil
end

Instance Method Details

#execute ⇒ Object 



17
18
19
20
21
22
23
24
25
 
# File 'lib/merge/resolve.rb', line 17

def execute
  prepare_tree_diffs

  migration = @repo.migration(@clean_diff)
  migration.apply_changes

  add_conflicts_to_index
  write_untracked_files
end

#on_progress(&block) ⇒ Object 



13
14
15
 
# File 'lib/merge/resolve.rb', line 13

def on_progress(&block)
  @on_progress = block
end