Hacker News new | ask | show | jobs
How git-mediate made me stop fearing merge conflicts (medium.com)
3 points by yairchu 3457 days ago