Module: GitCommands

Included in:
Merge, Rebase
Defined in:
lib/straight_line/common/git_commands.rb,
lib/straight_line/common/git_commands/log.rb,
lib/straight_line/common/git_commands/pull.rb,
lib/straight_line/common/git_commands/push.rb,
lib/straight_line/common/git_commands/merge.rb,
lib/straight_line/common/git_commands/commit.rb,
lib/straight_line/common/git_commands/config.rb,
lib/straight_line/common/git_commands/rebase.rb

Defined Under Namespace

Classes: Commit, Config, Log, Merge, Pull, Push, Rebase

Instance Method Summary collapse

Instance Method Details

#handle_merge_conflict(e) ⇒ Object 



3
4
5
6
7
8
9
 
# File 'lib/straight_line/common/git_commands.rb', line 3

def handle_merge_conflict(e)
  if e.message.match %r[Merge conflict in]
    Util.logger.error %q(***** Hint: this looks like a merge conflict.
        Try fixing the conflicts, then run `git add .` and then run the previous command again.)
  end
  raise e
end