seahorse [Ohio]@midwest.social to Programmer Humor@lemmy.mlEnglish · 2 years agoI'm going to sit down and actually learn git this weekmidwest.socialimagemessage-square63linkfedilinkarrow-up11.15K
arrow-up11.12KimageI'm going to sit down and actually learn git this weekmidwest.socialseahorse [Ohio]@midwest.social to Programmer Humor@lemmy.mlEnglish · 2 years agomessage-square63linkfedilink
minus-squarejjjalljs@ttrpg.networklinkfedilinkarrow-up4·2 years 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.
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.