1274
I'm going to sit down and actually learn git this week
(midwest.social)
Post funny things about programming here! (Or just rant about your favourite programming language.)
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.