3 ms·Yes, better conflict resolution is needed, but outside of scope for git. Do one thing well.by tasuki 4y agoYes, better conflict resolution is needed, but outside of scope for git. Do one thing well.