How git-mediate made me stop fearing merge conflicts | Dark Hacker News