To be precise, Git makes <i>merges</i> easy, not <i>merge conflicts</i>, which is what you're talking about. Handling merge conflicts automatically is AI-complete. But many SCM systems make even straightforward merges difficult.