Dealing with merge chaos

Did you ever got a diff like this? Chaotic right? File had 155 lines. 134 lines got deleted. 159 lines added. Effectively, everything changed. This commonly »