adityamparikh commented on PR #144:
URL: https://github.com/apache/solr-mcp/pull/144#issuecomment-5341583989

   Follow-up: this drifted back into conflict after shahzadarain/solr-mcp#1 was 
merged on 31 July, because more has landed on `main` since.
   
   I've opened a fresh merge PR — shahzadarain/solr-mcp#3 — against 
`feature/markdown-indexing`. Merging it makes this PR mergeable again; it's 
merge-only, no changes to @shahzadarain's markdown code.
   
   Only one real conflict this time, in `AGENTS.md`, where both sides edited 
the same two lines for different reasons: this branch adds markdown to the 
`IndexingService` line, while #178 corrected `metadata/` to `collection/` on 
the `CollectionService` line. I kept both correct halves rather than taking one 
side.
   
   Post-merge checks, since a clean auto-merge is what hides this class of 
breakage:
   - `MarkdownDocumentCreator` is still injected into and delegated to by 
`IndexingDocumentCreator` (that file auto-merged).
   - No new record types, so no `SolrNativeHints` entry is needed — 
`index-markdown-documents` returns `String`. Worth stating explicitly now that 
`main` carries `SolrNativeHintsTest`, since a missing hint would otherwise only 
fail in a full GraalVM build.
   - JDK 25: `compileJava`, `compileTestJava`, `spotlessCheck` all clean.
   
   My approval on the code stands.


-- 
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]

Reply via email to