Hacker News new | ask | show | jobs
by mi100hael 3158 days ago
> To be fair to the people whose merges failed, I believe this is a shortcoming of git (the tool) and not the people using it.

I disagree. Like everyone, I've experienced a failed merge that turns into a diff nightmare. However, when it has happened I've figured out how to solve it myself instead of wasting someone else's time with it, and it hasn't happened in years now leading me to believe it is directly correlated with git skill-level.