this post was submitted on 28 Aug 2024
528 points (97.0% liked)

Programmer Humor

32712 readers
1462 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
[–] collapse_already@lemmy.ml 2 points 3 months 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.