homebrew upgrade doesn't work

[Dimentium]

bash-3.2$ brew info goku
Error: goku: /opt/homebrew/Library/Taps/yqrashawn/homebrew-goku/Formula/goku.rb:9: syntax error, unexpected <<, expecting end
<<<<<<< HEAD
^~
/opt/homebrew/Library/Taps/yqrashawn/homebrew-goku/Formula/goku.rb:12: syntax error, unexpected ===, expecting end
=======
^~~
/opt/homebrew/Library/Taps/yqrashawn/homebrew-goku/Formula/goku.rb:15: syntax error, unexpected >>, expecting end
>>>>>>> 418d0fa (feat: release ...
^~
/opt/homebrew/Library/Taps/yqrashawn/homebrew-goku/Formula/goku.rb:15: syntax error, unexpected tIDENTIFIER, expecting do or '{' or '('
...>>>>> 418d0fa (feat: release v0.3.7)
...                             ^~
/opt/homebrew/Library/Taps/yqrashawn/homebrew-goku/Formula/goku.rb:15: no .<digit> floating literal anymore; put 0 before dot
...>>>> 418d0fa (feat: release v0.3.7)
... 

[yqrashawn]

oops, please try

cd /opt/homebrew/Library/Taps/yqrashawn/homebrew-goku/
git reset --hard origin/master

[Dimentium]

yep!

bash-3.2$ cd /opt/homebrew/Library/Taps/yqrashawn/homebrew-goku/
bash-3.2$ git reset --hard origin/master
HEAD is now at c1509a4 feat: pre release v0.3.7.1
bash-3.2$ brew info goku
yqrashawn/goku/goku: stable 0.3.7.1
karabiner configurator
https://github.com/yqrashawn/GokuRakuJoudo
/opt/homebrew/Cellar/goku/0.3.6 (5 files, 11.7MB) *
  Built from source on 2021-01-13 at 08:37:01
From: https://github.com/yqrashawn/homebrew-goku/blob/HEAD/Formula/goku.rb
==> Dependencies
Required: watchexec ✔, candid82/brew/joker ✔
==> Caveats
To have launchd start yqrashawn/goku/goku now and restart at login:
  brew services start yqrashawn/goku/goku
Or, if you don't want/need a background service you can just run:
  gokuw

[Dimentium]

but it "broke" homebrew update :)

> brew update
fatal: It seems that there is already a rebase-merge directory, and
I wonder if you are in the middle of another rebase.  If that is the
case, please try
    git rebase (--continue | --abort | --skip)
If that is not the case, please
    rm -fr ".git/rebase-merge"
and run me again.  I am stopping in case you still have something
valuable there.

> brew doctor
Warning: Some taps are not on the default git origin branch and may not receive
updates. If this is a surprise to you, check out the default branch with:
  git -C $(brew --repo yqrashawn/goku) checkout master

bash-3.2$ git -C $(brew --repo yqrashawn/goku) checkout master
Previous HEAD position was c1509a4 feat: pre release v0.3.7.1
Switched to branch 'master'
Your branch and 'origin/master' have diverged,
and have 1 and 2 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

[yqrashawn]

then try this

cd /opt/homebrew/Library/Taps/yqrashawn/homebrew-goku/
git rebase --abort
git fetch --all
git reset --hard origin/master
brew upgrade goku

[Dimentium]

yep! thank you!

❯ cd /opt/homebrew/Library/Taps/yqrashawn/homebrew-goku/
  git rebase --abort
  git fetch --all
  git reset --hard origin/master
  brew upgrade goku
Fetching origin
HEAD is now at 36531e4 feat: release v0.3.8
==> Upgrading 1 outdated package:
yqrashawn/goku/goku 0.3.7.1 -> 0.3.8
==> Upgrading yqrashawn/goku/goku 0.3.7.1 -> 0.3.8 
==> Downloading https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v0.3.8/goku.zip
==> Downloading from https://github-releases.githubusercontent.com/147006967/9188e300-7374-11eb-8a37-a009211fb3bf?X-Amz-Algorith
######################################################################## 100.0%
==> Caveats
To have launchd start yqrashawn/goku/goku now and restart at login:
  brew services start yqrashawn/goku/goku
Or, if you don't want/need a background service you can just run:
  gokuw
==> Summary
🍺  /opt/homebrew/Cellar/goku/0.3.8: 5 files, 11.7MB, built in 1 second
Removing: /opt/homebrew/Cellar/goku/0.3.7.1... (5 files, 11.7MB)
Removing: /Users/dk/Library/Caches/Homebrew/goku--0.3.7.1.zip... (3.3MB)