Hacker News new | ask | show | jobs
How Git creates and handles merge conflicts (git2go.com)
1 points by pietbrauer 3738 days ago