seahorse [Ohio] to Programmer Humor@lemmy.mlEnglish • 7 months agoI'm going to sit down and actually learn git this weekmidwest.socialimagemessage-square79fedilinkarrow-up11.25Karrow-down123
arrow-up11.22Karrow-down1imageI'm going to sit down and actually learn git this weekmidwest.socialseahorse [Ohio] to Programmer Humor@lemmy.mlEnglish • 7 months agomessage-square79fedilink
minus-square@lseiflink71•7 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-square@erogenouswarzone@lemmy.mllinkfedilinkEnglish15•7 months agoAlso, a way to never have to work again!
minus-square@Nahdahar@lemmy.worldlinkfedilink8•7 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.