Merge main into tiffany/feature/multi-provider-web-search, resolving conflicts#249
Merged
kien-ship-it merged 2 commits intoMar 10, 2026
Conversation
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
…ining all features Co-authored-by: kien-ship-it <122910950+kien-ship-it@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Fix merge conflicts in multi provider web search
Merge main into tiffany/feature/multi-provider-web-search, resolving conflicts
Mar 10, 2026
kien-ship-it
merged commit fff372c
into
tiffany/feature/multi-provider-web-search
4 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The feature branch had diverged from
mainafter several PRs landed (Ollama provider support, legal document templates, multi-model LLM routing), causing conflicts that blocked merging.Changes
Conflict resolution (
env.example) — only file with a true conflict; merged both sides:LANGCHAIN_TRACING_V2,LANGCHAIN_API_KEY,LANGCHAIN_PROJECT)main's new provider keys (ANTHROPIC_API_KEY,GOOGLE_AI_API_KEY,OLLAMA_BASE_URL,OLLAMA_MODEL)Auto-merged from
main(no conflicts):chat-model-factory.ts,documentQ&Aroutes/services)legal-generate/route.ts)section-builders,template-registry,template-service)LegalDocumentConfig,LegalDocumentEditor, model-aware badges)AIProvidersPage.tsx)src/env.tsschema additions for Anthropic, Google AI, Ollama vars💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.