4 ms·I'm afraid of commits.by DonHopkins 9mo agoI'm afraid of commits.dotancohen 9mo agoYou could wait a bit after forking.Towaway69 9mo agoSquash commit can fix the conflict.mmh0000 9mo agoDoesn't work if there are too many diffsTowaway69 9mo agoDiffs can always be patched up.deleted 9mo ago[deleted]BeetleB 9mo agoIt always ends up with a lot of blaming. In extreme cases, it terminates with a bisect.