How git-mediate made me stop fearing merge conflictsmedium.com3 points·yairchu··0 commentsOpen articleSaveView on HN