How git-mediate made me stop fearing merge conflicts

3 points| yairchu | 9 years ago |medium.com