seahorse [Ohio]@midwest.social to Programmer Humor@lemmy.mlEnglish · 1 year agoI'm going to sit down and actually learn git this weekmidwest.socialimagemessage-square79fedilinkarrow-up11.13Karrow-down120
arrow-up11.11Karrow-down1imageI'm going to sit down and actually learn git this weekmidwest.socialseahorse [Ohio]@midwest.social to Programmer Humor@lemmy.mlEnglish · 1 year agomessage-square79fedilink
minus-squarekaty ✨@lemmy.blahaj.zonelinkfedilinkarrow-up31arrow-down2·1 year agolemme rebase the main branch onto my branch. two minutes later 1 merge conflict of 57 [abort] [continue]
minus-squareaffiliate@lemmy.worldlinkfedilinkarrow-up9·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-up6·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!