adityamparikh commented on PR #144: URL: https://github.com/apache/solr-mcp/pull/144#issuecomment-5135075452
Hi @shahzadarain — friendly follow-up on the merge conflicts here. The resolution PR on your fork, shahzadarain/solr-mcp#1, is still open: merging it into `feature/markdown-indexing` will make this PR mergeable again. It is still current — only one docs-only commit (#167) has landed on `main` since it was prepared. If you would rather resolve the conflicts yourself (e.g. by merging upstream `main` into your branch locally), that works just as well. Happy to help if anything is unclear! -- 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]
