How to avoid repeated merge conflicts?
This is something I would recommend all developers to setup globally, you will love it and you won't even remeber it.
This is something I would recommend all developers to setup globally, you will love it and you won't even remeber it.