alessandrobenedetti commented on PR #2809: URL: https://github.com/apache/solr/pull/2809#issuecomment-2546038411
hi @malliaridis, I was meant to merge this today, but when rebasing from upstream main I ended up with a gigantic conflicting versions.lock. I spent already half an hour on it to then give up as I don't fully understand it. I am tagging you but in general, I would like to get some advice from the rest of the team: is this expected? What should be the procedure to solve this conflicting file? Solving each conflicting line one by one proved not ideal -- 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: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
