seahorse [Ohio]@midwest.social to Programmer Humor@lemmy.mlEnglish · 11 months agoI'm going to sit down and actually learn git this weekmidwest.socialimagemessage-square3fedilinkarrow-up113arrow-down10
arrow-up113arrow-down1imageI'm going to sit down and actually learn git this weekmidwest.socialseahorse [Ohio]@midwest.social to Programmer Humor@lemmy.mlEnglish · 11 months agomessage-square3fedilink
minus-squarelseif@sopuli.xyzlinkfedilinkarrow-up1·11 months agoif u ever get a tricky merge conflict, just git push --force. this automatically works out the right code to keep (your own)
if u ever get a tricky merge conflict, just
git push --force
. this automatically works out the right code to keep (your own)