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 16:49:22 UTC

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

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


   Which mergetool do you use that commits for you? I use vimdiff and it does not, or maybe there's a setting I need to enable.


-- 
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