Bad merge in commit crashing brew update
Closed this issue · 4 comments
If I run brew update (I have used the wrap feature) I get these errors. Looks like a bad merge or something?
Error: Failed to import: /usr/local/Homebrew/Library/Taps/rcmdnk/homebrew-file/brew-file.rb
brew-file: /usr/local/Homebrew/Library/Taps/rcmdnk/homebrew-file/brew-file.rb:4: syntax error, unexpected <<, expecting end
<<<<<<< HEAD
^~
/usr/local/Homebrew/Library/Taps/rcmdnk/homebrew-file/brew-file.rb:7: syntax error, unexpected ===, expecting end
=======
^~~
/usr/local/Homebrew/Library/Taps/rcmdnk/homebrew-file/brew-file.rb:10: syntax error, unexpected >>, expecting end
>>>>>>> caskroom/cask to homebr...
^~
/usr/local/Homebrew/Library/Taps/rcmdnk/homebrew-file/brew-file.rb:10: syntax error, unexpected tIDENTIFIER, expecting do or '{' or '('
>>>>>>> caskroom/cask to homebrew/cask
^~
Updating Homebrew...
Okay, looking at the master branch brew-file.rb, it did not seem to have the error that is being thrown.
I re-installed brew-file with brew reinstall brew-file and it seems to be fine now.
This has resurfaced again.
So the whenever there is a new release available for homebrew-file, I start getting the same merge commit errors as in the OP, which breaks the flow further.
I thought that this was a one-off issue when I had reported earlier, but it seems to be happening consistently when a new release is available.
The work around seems to be uninstall and install homebrew-file, which is a bit annoying.
How can I help add any more information to this report?
Maybe your tap has a wrong history (directly merge at /usr/local/Homebrew/Library/Taps/rcmdnk/homebrew-file/ by hand?).
Could you please try:
brew uninstall brew-file
brew untap rcmdnk/file
brew tap rcmdnk/file
brew install brew-file
Thanks. I wish I had more insight.
Anyways, I have followed your instructions. Logs seem to be normal. I will wait till the next release and report back? Closing for now.
Details
~/DEV
❯ brew uninstall brew-file
Uninstalling /usr/local/Cellar/brew-file/8.0.0... (9 files, 179.8KB)
##############################################################################
# Initialize /Users/raisedadead/.config/brewfile/raisedadead_Brewfile/Brewfile
##############################################################################
######################################################################################
# You can edit /Users/raisedadead/.config/brewfile/raisedadead_Brewfile/Brewfile with:
# $ brew-file edit
######################################################################################
~/DEV took 4s
❯ brew untap rcmdnk/file
Untapping rcmdnk/file...
Untapped 1 formula (57 files, 1.8MB).
~/DEV
❯ brew tap rcmdnk/file
Updating Homebrew...
==> Auto-updated Homebrew!
Updated Homebrew from 7f69550e0 to 92f26e991.
Updated 6 taps (heroku/brew, homebrew/cask-versions, homebrew/core, homebrew/cask, homebrew/bundle and homebrew/cask-fonts).
==> New Formulae
duktape openfast redo vlmcsd
==> Updated Formulae
...
...
==> Tapping rcmdnk/file
Cloning into '/usr/local/Homebrew/Library/Taps/rcmdnk/homebrew-file'...
remote: Enumerating objects: 116, done.
remote: Counting objects: 100% (116/116), done.
remote: Compressing objects: 100% (69/69), done.
remote: Total 4900 (delta 59), reused 84 (delta 34), pack-reused 4784
Receiving objects: 100% (4900/4900), 1.21 MiB | 1.25 MiB/s, done.
Resolving deltas: 100% (2532/2532), done.
Tapped 1 formula (55 files, 1.8MB).
~/DEV took 20s
❯ brew install brew-file
==> Installing brew-file from rcmdnk/file
==> Downloading https://github.com/rcmdnk/homebrew-file/archive/v8.0.0
Already downloaded: /Users/raisedadead/Library/Caches/Homebrew/downloads/02960f8da1fcbe088cd50610b0cb65c70d5f320b5fc4a99e624fd240f3a42d3d--homebrew-file-8.0.0.tar.gz
==> Caveats
Bash completion has been installed to:
/usr/local/etc/bash_completion.d
zsh completions have been installed to:
/usr/local/share/zsh/site-functions
==> Summary
🍺 /usr/local/Cellar/brew-file/8.0.0: 9 files, 179.8KB, built in 3 seconds
~/DEV took 7s
❯