seahorse [Ohio]@midwest.social to Programmer Humor@lemmy.mlEnglish · 1 year agoI'm going to sit down and actually learn git this weekmidwest.socialimagemessage-square53fedilinkarrow-up1589arrow-down18
arrow-up1581arrow-down1imageI'm going to sit down and actually learn git this weekmidwest.socialseahorse [Ohio]@midwest.social to Programmer Humor@lemmy.mlEnglish · 1 year agomessage-square53fedilink
minus-squarekaty ✨@lemmy.blahaj.zonelinkfedilinkarrow-up21arrow-down1·1 year agolemme rebase the main branch onto my branch. two minutes later 1 merge conflict of 57 [abort] [continue]
minus-squareaffiliate@lemmy.worldlinkfedilinkarrow-up8·1 year agothis is easily fixed by copy pasting the files into a new directory and never opening git again out of fear
minus-squarecaseyweederman@lemmy.calinkfedilinkarrow-up3·1 year agoProject managers hate this one weird trick!
lemme rebase the main branch onto my branch.
two minutes later
1 merge conflict of 57 [abort] [continue]
this is easily fixed by copy pasting the files into a new directory and never opening git again out of fear
Project managers hate this one weird trick!