adityamparikh commented on PR #86: URL: https://github.com/apache/solr-mcp/pull/86#issuecomment-5512224121
Hi @jzonthemtn — this branch has drifted a fair way from `main` (68 commits since the merge base, `6009213`) and now conflicts, so GitHub won't let it merge. Would you mind rebasing onto current `main`? There are two conflicting files, and both are semantic rather than just textual — worth flagging so the rebase isn't surprising: **1. `src/test/java/org/apache/solr/mcp/server/McpToolRegistrationTest.java`** — package rename. `SchemaService` moved on `main`: ```java // this branch import org.apache.solr.mcp.server.metadata.SchemaService; // main import org.apache.solr.mcp.server.schema.SchemaService; ``` `CollectionService` moved `metadata/` -> `collection/` in the same reorganisation, so it's worth grepping the branch for any other `.metadata.` imports while you're in there. **2. `src/main/java/org/apache/solr/mcp/server/config/SolrConfig.java`** — this one needs a real decision. `main` has since refactored the `solrClient` bean into a static `buildSolrClient(...)` helper that normalises the Solr URL against its *path* (so a `/solr/` inside an authority like `http://solr/` isn't mistaken for the path already being present). This PR adds a `RestClient` bean and its own `solrClient` bean over the older shape. The two want the same region of the file, so the `RestClient` addition needs re-applying on top of `main`'s normalising version rather than replacing it. Happy to help if it turns out more tangled than that. For what it's worth, I couldn't check whether the branch builds green because the conflicts block the merge entirely — once it's rebased that'll be answerable. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
