this post was submitted on 28 Aug 2024
525 points (97.1% liked)

Programmer Humor

32042 readers
1387 users here now

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

Rules:

founded 5 years ago
MODERATORS
 
you are viewing a single comment's thread
view the rest of the comments
[–] [email protected] 2 points 2 weeks ago

I literally make a new branch. clone, and use an external merge tool (beyond compare) when my branch has fallen too far behind. I don't trust any of the automated processes.