adityamparikh commented on PR #144: URL: https://github.com/apache/solr-mcp/pull/144#issuecomment-4995475683
Hi @shahzadarain — this PR currently has merge conflicts with `main`: the README tools section was restructured by #151, and #146 added constructor Javadoc on the same lines this branch touches in `IndexingDocumentCreator`. I've resolved the conflicts by merging current `main` into your branch and opened shahzadarain/solr-mcp#1 against `feature/markdown-indexing`. If you merge that, this PR will update automatically and become mergeable again. The merge result builds clean (`./gradlew build`, 328 tests passing, including the MCP stdio integration test that exercises `index-markdown-documents` end to end). Of course, feel free to resolve the conflicts your own way instead if you'd prefer different choices — happy to close my PR in that case. -- 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]
