gistfile1.txt

def system_or_exit(cmd, stdout = nil)
  puts "Executing #{cmd}"
  cmd += " > \"#{stdout}\"" if stdout
  system(cmd) or raise "******** Build failed ********"
end

namespace :git do
  desc "Merge feature branch"
  task :merge do
    system_or_exit 'git checkout master'
    system_or_exit 'git diff origin/master..HEAD --quiet --exit-code'
    system_or_exit 'git reset origin/master --hard'
    system_or_exit 'git pull --rebase'
    system_or_exit 'git checkout -'
    system_or_exit 'git rebase master'
    system_or_exit 'git checkout -'
    system_or_exit 'git merge --no-ff -'
  end
end