testeronious@lemmy.world to Git@programming.dev · 7 months agoArticle argues that git is intrinsically confusing--if you could redesign git from scratch, what would you change?dl.acm.orgexternal-linkmessage-square28fedilinkarrow-up136arrow-down12
arrow-up134arrow-down1external-linkArticle argues that git is intrinsically confusing--if you could redesign git from scratch, what would you change?dl.acm.orgtesteronious@lemmy.world to Git@programming.dev · 7 months agomessage-square28fedilink
minus-squareabbadon420@lemm.eelinkfedilinkarrow-up10·7 months agoDefinitely something about merge and rebase.
minus-squareGary@awscommunity.sociallinkfedilinkarrow-up4·7 months ago@abbadon420 @testeronious Yes! There has to be something better than >>>> here and there and over there for merge conflicts.
Definitely something about merge and rebase.
@abbadon420 @testeronious Yes! There has to be something better than >>>> here and there and over there for merge conflicts.