seahorse [Ohio]@midwest.social to Programmer Humor@lemmy.mlEnglish · 1 year agoI'm going to sit down and actually learn git this weekmidwest.socialimagemessage-square84fedilinkarrow-up11.3Karrow-down123
arrow-up11.27Karrow-down1imageI'm going to sit down and actually learn git this weekmidwest.socialseahorse [Ohio]@midwest.social to Programmer Humor@lemmy.mlEnglish · 1 year agomessage-square84fedilink
minus-squarejjjalljs@ttrpg.networklinkfedilinkarrow-up4·1 year 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.