logoalt Hacker News

SupperOfTheLambtoday at 8:18 AM0 repliesview on HN

They say in the article: the correct resolution of a merge depends on the context. Automatic resolution may introduce bugs!