Discussion

Ask HN: How often does Git merge make mistakes?

I was working on an express app with a friend and git auto merged a file after I ran 'git pull'. There were no merge conflicts, but git added duplicate functions to a file after merge. I spent an hour trying to figure our what the problem was before realizing that git had made a mistake while merging.

I had never seen such a thing before. How often does something like this happen?

1 points iceman_w 11 years ago 5 comments

Discussion

Live from the official Hacker News API

A modern reader for Hacker News · SvelteKit + Skeleton