HoustonPutman commented on pull request #595: URL: https://github.com/apache/solr/pull/595#issuecomment-1036531144
> OMG, it seems I messed up with conflict merge in Eclipse... It looks like the merge commit swallowed up all the other commits on main... Try resetting your head to before the merge commit (the last commit on this branch), then force pushing. Then just do the merge via the Github UI, since it'll be a small conflict. -- 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
