You are viewing a plain text version of this content. The canonical link for it is here.

Posted to issues@solr.apache.org by GitBox <gi...@apache.org> on 2022/02/19 18:10:53 UTC

[GitHub] [solr] janhoy commented on pull request #655: cherry-pick continue after merge conflict

janhoy commented on pull request #655:
URL: https://github.com/apache/solr/pull/655#issuecomment-1046075113


   I usually fire up IDEA, and once the conflict is resolved there, it will be marked as resolved. I have also looked as Sublime Merge but not used it much.


-- 
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-unsubscribe@solr.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org