15 ms·
Git supports external merge tools (per file type too). They don't need to be packaged with the base install IMO, and git won't support every language under the
by palunon 10y ago
Git supports external merge tools (per file type too). They don't need to be packaged with the base install IMO, and git won't support every language under the sun.
For example Unity3D are distributing one for their assets (which are not nice to merge as simple text)
- BinaryIdiot 10y agoFor sure and I didn't mean they should necessarily be packaged with the base install either (though I'd argue as long as they're developed in a way that they can be updated you could provide a better UX bundling a few most common ones in). It's certainly doable though my only worry is them being almost smart enough and making a big mistake that isn't immediately noticeable.