Hacker News new | ask | show | jobs
Ask HN: What is your favourite diff/merge tools?
1 points by nodivbyzero 2253 days ago
Just wondering what kind of tools/strategies/flow do you use for resolving merge conflicts?