Problem
The feature/community-oidc branch has unresolved git merge conflict markers in src/metabase/metabot/self/openai.clj (around line 259), causing:
- Custom AI Provider CI — fails with
Syntax error macroexpanding clojure.core/defn because <<<<<<< HEAD markers are parsed as Clojure code
- Docker build — fails during Clojure compilation for the same reason
Root Cause
When syncing upstream master into feature/community-oidc, the merge of openai.clj produced a conflict that was committed without resolution. The list-models function has <<<<<<< HEAD / ======= / >>>>>>> markers splitting two versions of the function body.
Evidence
CI log (run https://github.com/siliconflow/metabase/actions/runs/30427418833):
Syntax error macroexpanding clojure.core/defn at (metabase/metabot/self/openai.clj:259:1).
<<<<<<< - failed: vector? at: [:fn-tail :arity-1 :params]
Fix
Manually resolve the merge conflict in src/metabase/metabot/self/openai.clj, keeping the community-oidc custom provider changes while incorporating upstream updates to the list-models function.
Problem
The
feature/community-oidcbranch has unresolved git merge conflict markers insrc/metabase/metabot/self/openai.clj(around line 259), causing:Syntax error macroexpanding clojure.core/defnbecause<<<<<<< HEADmarkers are parsed as Clojure codeRoot Cause
When syncing upstream
masterintofeature/community-oidc, the merge ofopenai.cljproduced a conflict that was committed without resolution. Thelist-modelsfunction has<<<<<<< HEAD/=======/>>>>>>>markers splitting two versions of the function body.Evidence
CI log (run https://github.com/siliconflow/metabase/actions/runs/30427418833):
Fix
Manually resolve the merge conflict in
src/metabase/metabot/self/openai.clj, keeping the community-oidc custom provider changes while incorporating upstream updates to thelist-modelsfunction.