brew cask install java7的にjdk-7u51をインストールしようとしたら、pkgファイルの指定が間違えていて失敗した。
気楽にbrew cask edit java7でrbファイルを修正したんだけど、その後、brew updateで残念なエラーが出てしまい困ったので、その解決方法をメモ。
$ brew update
error: Your local changes to the following files would be overwritten by merge:
Casks/java7.rb
Please, commit your changes or stash them before you can merge.
Aborting
Error: Failed to update tap: caskroom/versions
$ cd /usr/local/Library/Taps/caskroom/homebrew-versions
$ git status
On branch master
Your branch is behind 'origin/master' by 94 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: Casks/java7.rb
no changes added to commit (use "git add" and/or "git commit -a")
$ git checkout Casks/java7.rb
$ git status
On branch master
Your branch is behind 'origin/master' by 94 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
nothing to commit, working directory clean
ようやく復活。。。