How git-mediate made me stop fearing merge conflicts #1 Post by yairchu » Sat, Dec 31, 2016, 10:30 AM UTC How git-mediate made me stop fearing merge conflictsmedium.com