Method: Braid::Operations::Git#merge_ours

Defined in:
lib/braid/operations.rb

#merge_ours(opt) ⇒ Object

Implies no commit.



210
211
212
213
 
# File 'lib/braid/operations.rb', line 210

def merge_ours(opt)
  invoke(:merge, "-s ours --no-commit", opt)
  true
end