message no. 93279
Posted by marcosscriven in #github at 2015-05-11T11:53:28Z
I know I can git reset the conflicted dirs, but that's happening for every cherry pick (because the stream I'm cherry picking into still has the submodule, whereas it's been deleted from the old one)