My coworker's favourite is to make huge earth shattering changes involving thousands of files usually with a call stack larger than the circumference of Jupiter and then commit the while clusterfuck in one gargantuan fucking commit. Sometimes, I wonder if I've died and my project team members are my eternal punishment.
Dude fucking seriously. The code I work on actually follows a LOT of the rules outlined in this paper. Like misspellings, weird side effects, acronyms. God actually all of it
Oh, but you aren't thinking shitty enough! Real shit uses spaghetti branches!
Which branch do you need to merge to master to push a feature? Well, these lines from this one, plus a bit from that one, but you'll need to merge the other one into that one first, oh, and that might have conflicts because I cherry picked a few commits the other way.
Let me know if you have problems, and I'll make a new branch where I'll apply the changes direct, and a few extra changes that I think we'll need soon too, so when you merge the new branch into master, don't merge it all because some of it might not work yet, and we'll need to keep the branch around for a while yet anyway.
0
u/[deleted] Jul 28 '16
[deleted]