Last active
August 27, 2015 17:54
-
-
Save shouhei/44b6528398eb57b23c80 to your computer and use it in GitHub Desktop.
git mergeにしっぱいしたらmp3を流す
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #! /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