seahorse [Ohio] to Programmer [email protected]English • 11 months agoI'm going to sit down and actually learn git this weekmidwest.socialimagemessage-square85fedilinkarrow-up11.29Karrow-down123
arrow-up11.26Karrow-down1imageI'm going to sit down and actually learn git this weekmidwest.socialseahorse [Ohio] to Programmer [email protected]English • 11 months agomessage-square85fedilink
minus-square@[email protected]linkfedilink68•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)
minus-square@[email protected]linkfedilinkEnglish14•11 months agoAlso, a way to never have to work again!
minus-square@[email protected]linkfedilink7•11 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.