Clojure-lsp: Recent release messed up homebrew

[FongHou]

Hi, this is not a bug report. Just a FYI.

Describe the bug
I ran brew update, then clojure-lsp homebrew repo got into this state.

/h/l/.l/H/L/T/c/homebrew-brew @bda0079• 4.2s ❱ gs
rebase in progress; onto bda0079
You are currently rebasing branch 'main' on 'bda0079'.
  (fix conflicts and then run "git rebase --continue")
  (use "git rebase --skip" to skip this patch)
  (use "git rebase --abort" to check out the original branch)

Unmerged paths:
  (use "git restore --staged <file>..." to unstage)
  (use "git add <file>..." to mark resolution)
        both modified:   clojure-lsp-native.rb

no changes added to commit (use "git add" and/or "git commit -a")
/h/l/.l/H/L/T/c/homebrew-brew @bda0079• ❱ gdi
diff --cc clojure-lsp-native.rb
index 2685444,0b933eb..0000000
--- a/clojure-lsp-native.rb
+++ b/clojure-lsp-native.rb
@@@ -1,14 -1,14 +1,25 @@@
  class ClojureLspNative < Formula
    desc "Language Server (LSP) for Clojure"
    homepage "https://github.com/clojure-lsp/clojure-lsp"
++<<<<<<< HEAD
 +  version "2022.01.22-01.31.09"
 +
 +  if OS.mac?
 +    url "https://github.com/clojure-lsp/clojure-lsp/releases/download/2022.01.22-01.31.09/clojure-lsp-native-macos-amd64.zip"
 +    sha256 "9c96cfc64157a6dbe51e620de20711984f3ea5b7687ae8a3ed7aa5ebc54453ae"
 +  elsif OS.linux?
 +    url "https://github.com/clojure-lsp/clojure-lsp/releases/download/2022.01.22-01.31.09/clojure-lsp-native-linux-amd64.zip"
 +    sha256 "88317b14c00930c0ff4d3c1f6a0a5d81114a92cfeca2a9e90a2d7d631c73aa1b"
++=======
+   version "2022.01.21-14.32.59"
+
+   if OS.mac?
+     url "https://github.com/clojure-lsp/clojure-lsp/releases/download/2022.01.21-14.32.59/clojure-lsp-native-macos-amd64.zip"
+     sha256 ""
+   elsif OS.linux?
+     url "https://github.com/clojure-lsp/clojure-lsp/releases/download/2022.01.21-14.32.59/clojure-lsp-native-linux-amd64.zip"
+     sha256 ""
++>>>>>>> Bump to version: 2022.01.21-14.32.59
    end

To Reproduce
Run "brew update" messed up homebrew git repo

Expected behavior
Shouldn't

User details (please complete the following information):

• OS: Windows 10 WSL
• Version: (post the result of clojure-lsp --version)

Additional context
Add any other context about the problem here.

[ericdallo]

Thanks, I'll fix it ASAP

[ericdallo]

@FongHou actually, not sure why this happens, the repo seems correct to me: https://github.com/clojure-lsp/homebrew-brew/blob/main/clojure-lsp-native.rb

[FongHou]

Hmm.. mine is in Taps/clojure-lsp. Let me remove that, then install the one you have.

[ericdallo]

I see, make sure you follow this one: https://clojure-lsp.io/installation/#homebrew-macos-and-linux

[FongHou]

That fixed it. Thanks!