bursauxa commented on PR #784: URL: https://github.com/apache/solr/pull/784#issuecomment-1961302696
> > Bumping this PR at it is still applicable > > Thanks @bursauxa for the ping! Would you be comfortable resolving the above mentioned merge conflict e.g. `git merge origin/main` on the command line, or IDE equivalent? Hello @cpoerschke, the conflict was not with myself if I can say so :wink: but with the upstream. Resolution was performed using `git rebase upstream/main`. -- 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]
