697
Merge conflicts
(feddit.nl)
Welcome to Programmer Humor!
This is a place where you can post jokes, memes, humor, etc. related to programming!
For sharing awful code theres also Programming Horror.
Agree with this. Never changed from master as it would cost the business money to do so (and involve a ton of headaches) for no reason. Thankfully the whole dept agreed on that.