4 ms·
Even better, one can specify a mergetool in their config, and use a standard diff tool to resolve conflicts.
by rallison 13y ago
Even better, one can specify a mergetool in their config, and use a standard diff tool to resolve conflicts.
- taspeotis 13y agoAt work, my Git repos are exclusively C# and I've been using SemanticMerge [1] for resolving conflicts to good effect. [1] https://www.semanticmerge.com/ https://www.semanticmerge.com/
- voltagex_ 13y agoIt's a pity they're a subscription and also they want me to log in to view the pricing. Edit: There is a once-off price and also somewhere to apply if you're working on open source.