adityamparikh commented on PR #144: URL: https://github.com/apache/solr-mcp/pull/144#issuecomment-5512221121
Hi @shahzadarain — this one has drifted out of mergeable state against `main`, so GitHub currently reports it as conflicting. Would you mind rebasing? The good news is that it's a very small fix. **The only conflict is one hunk in `AGENTS.md`** — none of the Java changes conflict at all: ``` - **IndexingService** (`indexing/`) - Document indexing supporting JSON, CSV, XML formats - **CollectionService** (`collection/`) - List collections, get stats, health checks <-- main - **CollectionService** (`metadata/`) - List collections, get stats, health checks <-- this PR ``` The cause is that `CollectionService` moved package from `metadata/` to `collection/` on `main` after this branch was cut. The resolution is to keep `main`'s `collection/` path and carry over your "and markdown" addition to the `IndexingService` line: ``` - **IndexingService** (`indexing/`) - Document indexing supporting JSON, CSV, XML, and markdown formats - **CollectionService** (`collection/`) - List collections, get stats, health checks ``` I resolved it that way locally and ran the full CI suite on the merge result — `classes testClasses spotlessCheck`, `unitTest` and `integrationTest` **all pass**, so resolving that single hunk should be all that's needed. The branch is 17 commits behind `main` (merge base `582490b`). -- 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]
