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

   I rebased this onto current `main` to check how bad the conflict was — it's 
small, and the result
   builds clean. Pushed to my fork in case it's useful:
   
[`adityamparikh:rebase-offer/pr144-markdown-indexing`](https://github.com/adityamparikh/solr-mcp/tree/rebase-offer/pr144-markdown-indexing)
   
   ```bash
   git remote add aditya https://github.com/adityamparikh/solr-mcp.git
   git fetch aditya
   git reset --hard aditya/rebase-offer/pr144-markdown-indexing
   ```
   
   Only if you want it — no need to take it, and I haven't touched this PR. 
**387 tests, 0 failures**,
   with all 11 markdown tests passing.
   
   Three conflicts, and I made a judgement call on two that you should check:
   
   **`IndexingDocumentCreator.java`** — mechanical. `main` added a constructor 
javadoc while this
   branch added the `markdownDocumentCreator` field. Kept both, and documented 
the new
   `@param markdownDocumentCreator` since the constructor signature changed 
here.
   
   **`AGENTS.md`** — this branch listed `CollectionService (metadata/)`, but 
the package is
   `collection/`. Took `main`'s path and kept your markdown addition to the 
`IndexingService` line.
   
   **`README.md`** — this is the one to review. Your side restructured the flat 
tool table into
   `### Indexing` / `### Collections` sections; `main` meanwhile reworded the 
`create-collection` row.
   I resolved conservatively — kept `main`'s flat table and added only the
   `index-markdown-documents` row — on the grounds that a table restructure is 
a separate change from
   markdown support and shouldn't ride in on a rebase. **If the sectioning was 
deliberate, override
   me**; it's a reasonable improvement, just worth being its own decision.
   
   The id-semantics question from my earlier comment is unaffected by any of 
this and still worth a
   look.


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