1278
you are viewing a single comment's thread
view the rest of the comments
[-] jjjalljs@ttrpg.network 4 points 2 years ago

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.

this post was submitted on 09 Nov 2023
1278 points (100.0% liked)

Programmer Humor

38576 readers
354 users here now

Post funny things about programming here! (Or just rant about your favourite programming language.)

Rules:

founded 6 years ago
MODERATORS