seahorse [Ohio]@midwest.social to Programmer Humor@lemmy.mlEnglish · 8 months agoI'm going to sit down and actually learn git this weekmidwest.socialimagemessage-square79fedilinkarrow-up11.26Karrow-down123
arrow-up11.24Karrow-down1imageI'm going to sit down and actually learn git this weekmidwest.socialseahorse [Ohio]@midwest.social to Programmer Humor@lemmy.mlEnglish · 8 months agomessage-square79fedilink
minus-squarelseif@sopuli.xyzlinkfedilinkarrow-up74arrow-down4·8 months agoif u ever get a tricky merge conflict, just git push --force. this automatically works out the right code to keep (your own)
minus-squareerogenouswarzone@lemmy.mllinkfedilinkEnglisharrow-up15·8 months agoAlso, a way to never have to work again!
minus-squareNahdahar@lemmy.worldlinkfedilinkarrow-up8·8 months agoExcept if you’re an employer in a very small company. Source: my boss did this at the first company I worked at.
if u ever get a tricky merge conflict, just
git push --force. this automatically works out the right code to keep (your own)Also, a way to never have to work again!
Except if you’re an employer in a very small company.
Source: my boss did this at the first company I worked at.