4 ms·I agree, but that doesn't seem relevant. I did not say the jj automatically resolves conflicts.by martinvonz 6mo agoI agree, but that doesn't seem relevant. I did not say the jj automatically resolves conflicts.