|Erasmus| wrote:FT, or maybe more of a Rant:
I hate our revision control system and the stupidity that ensues around here because of it. It makes false guarantees about multiple changes not conflicting with other when submitted for integration by just not letting us submit multiple changes which edit the same file(s). So we constantly integrate things which break stuff because we try to test lots of 'non conflicting' changes at once on the same baseline, and we end up with ridiculous amounts of office politics as everyone tries to work out who gets to go next with regards to these conflicting changes. It doesn't help that the built in merge command is incapable of resolving any kind of difference automatically.
Really, I'm just sick of having to wait for other integrations, merge with the baseline, and then get harrassed to put my (untested on the current baseline) change up for integration quickly because otherwise people will block, or start getting on my managers case because it is now her 'turn' to get stuff tested/integrated and she hasn't put anything up in the last 5 seconds!
tl;dr. Fuck the workflow around here.
Out of curiosity, what VCS are you using?