527
It happens each time!
(lemmy.world)
Post funny things about programming here! (Or just rant about your favourite programming language.)
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.