3 ms·The merge conflict tool in Intellij should really be a product on its own. It's the best IMOby nanagojo 6y agoThe merge conflict tool in Intellij should really be a product on its own. It's the best IMO