seahorse [Ohio]@midwest.social to Programmer Humor@lemmy.mlEnglish · 10 months agoI'm going to sit down and actually learn git this weekmidwest.socialimagemessage-square73fedilinkarrow-up1549arrow-down112
arrow-up1537arrow-down1imageI'm going to sit down and actually learn git this weekmidwest.socialseahorse [Ohio]@midwest.social to Programmer Humor@lemmy.mlEnglish · 10 months agomessage-square73fedilink
minus-squarejjjalljs@ttrpg.networklinkfedilinkarrow-up2·10 months agoIf I get a big conflict and I know my change is trivial, I feel perfectly okay doing git fetch git reset --hard whatever and then reapplying my simple change as a new commit. Sort of a bootleg rebate.
deleted by creator
If I get a big conflict and I know my change is trivial, I feel perfectly okay doing git fetch git reset --hard whatever and then reapplying my simple change as a new commit. Sort of a bootleg rebate.