Method: Git::Branch#merge

Defined in:
lib/git/branch.rb

#merge(branch = nil, message = nil) ⇒ Object 



67
68
69
70
71
72
73
74
75
76
77
78
 
# File 'lib/git/branch.rb', line 67

def merge(branch = nil, message = nil)
  if branch
    in_branch do 
      @base.merge(branch, message)
      false
    end
    # merge a branch into this one
  else
    # merge this branch into the current one
    @base.merge(@name)
  end
end