Overlooking merge conflicts will lead you to a merge hell.github.com1 point·seyz··0 commentsOpen articleSaveView on HN