Gary@awscommunity.socialtoGit@programming.dev•Article argues that git is intrinsically confusing--if you could redesign git from scratch, what would you change?
4·
9 months ago@abbadon420 @testeronious Yes! There has to be something better than >>>> here and there and over there for merge conflicts.
@yogthos now the third option is definitely the right way.