How to avoid repeated merge conflicts? I would recommend all developers to set up this globally; you will love it and won't even remember it.