That might be an improvement over git, but not automatically fixing the conflicts will be a dealbreaker for most people. Fundamentally people want something th

That might be an improvement over git, but not automatically fixing the conflicts will be a dealbreaker for most people. Fundamentally people want something that automatically fixes conflicts, and do so the way they expect it to, but this just doesn't exist yet.