From 2d67c5ee8f7bfe1ac68bde638af852c67816cb7f Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Mon, 3 Nov 2014 10:00:50 +0000 Subject: [PATCH] brew-pull: allow resolution with --resolve. --- Library/Homebrew/cmd/pull.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/cmd/pull.rb b/Library/Homebrew/cmd/pull.rb index e1b3892f21..1031a2f23c 100644 --- a/Library/Homebrew/cmd/pull.rb +++ b/Library/Homebrew/cmd/pull.rb @@ -34,8 +34,12 @@ module Homebrew begin safe_system 'git', 'am', *patch_args rescue ErrorDuringExecution - system 'git', 'am', '--abort' - odie 'Patch failed to apply: aborted.' + if ARGV.include? "--resolve" + odie "Patch failed to apply: try to resolve it." + else + system 'git', 'am', '--abort' + odie 'Patch failed to apply: aborted.' + end ensure patchpath.unlink end