How git-mediate made me stop fearing merge conflicts(medium.com)3 points by yairchu 9 years ago | 0 commentsNo comments yet