3 ms·It gets even uglier when you don't discover those conflicts until a pull or push.by JoshTriplett 12y agoIt gets even uglier when you don't discover those conflicts until a pull or push.