Comment on
Article argues that git is intrinsically confusing--if you could redesign git from scratch, what would you change?
Reply in thread
@abbadon420 @testeronious Yes! There has to be something better than >>>> here and there and over there for merge conflicts.