4 ms·
Do you mean "github.com" or Atom their editor? Yeah, sure Rich Editors support the "basics" of diffing, but for complex (i.e. 3-way) merges, I find them pretty
by berkut 5y ago
Do you mean "github.com" or Atom their editor?
Yeah, sure Rich Editors support the "basics" of diffing, but for complex (i.e. 3-way) merges, I find them pretty limiting: stuff like Beyond Compare, p4diff are more useful in those situations IMO.
- brundolf 5y agoYeah, github.com has started adding rich hover-overs and click-throughs on their web interface for some languages I'm not familiar with those other tools, but it's not hard to imagine they or similar tools could one day add rich language integration using language servers, tree-sitter, or something else