Hacker News new | ask | show | jobs
by avarun 142 days ago
It just reads through the merge conflict and intelligently resolves it. This is not a problem.