Skip to content

Instantly share code, notes, and snippets.

@shouhei
Last active August 27, 2015 17:54
Show Gist options
  • Select an option

  • Save shouhei/44b6528398eb57b23c80 to your computer and use it in GitHub Desktop.

Select an option

Save shouhei/44b6528398eb57b23c80 to your computer and use it in GitHub Desktop.
git mergeにしっぱいしたらmp3を流す
#! /usr/bin/env ruby
# coding: utf-8
args = ""
ARGV.each do |str|
args += (" " + str)
end
`git merge #{args} 2> /dev/null`
conflicts = `git ls-files -u`
unless conflicts.empty? then
puts ""
puts ""
puts " --------------------------------------------------"
puts " | |"
puts " | おきのどくですが マージ はコンフリクトしました |"
puts " | |"
puts " --------------------------------------------------"
puts ""
puts ""
`afplay ~/.merge-dq/dp_deleted.mp3`
end
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment