Ruby magic on cherry picking whole branch with merge fast-forward problems

git_cherry_pick.rb

#!/usr/bin/env ruby

def system!(*args)
  system(*args) || abort("\n== Command #{args} failed ==")
end

# you need to change this :)
commits = %w(a3d2f06 5a7867b f732f0c 1ae71c7 43c2c18 04d4e3c f477de2 446558e eec5628 2a8ea6a 8143565 4d54f04 87e04e2 4b6d641 0cdb2a6 de5af95)

# reverse because we need to cherry-pick commits first-last
commits.reverse.each do |commit|
  system! "git cherry-pick --allow-empty --keep-redundant-commits --strategy=recursive -X theirs #{commit}"
end