Yair ChuchemHow git-mediate made me stop fearing merge conflicts and start treating them like an easy game of…If you’ve ever had to deal with git merge conflicts, then there’s a good chance that these messages give you the chills:Dec 28, 20162Dec 28, 20162
