The Lounge is rated Safe For Work. If you're about to post something inappropriate for a shared office environment, then don't post it. No ads, no abuse, and no programming questions. Trolling, (political, climate, religious or whatever) will result in your account being removed.
Been doing this = managing the main source code stream for several years in a team of more than 50 people. Never again. Librarian is highly interesting since you are the one knowing every single part of the code after some time, but resolving conflicts, in the code while merging and of course among the developers in the team, is exhausting.
You have my sympathy and respect.
Fortunately where I work we commit and merge our own changes, so we are personally responsible for resolving merge conflicts.
I can imagine that having to resolve other people's merge conflicts is no easy task.
“That which can be asserted without evidence, can be dismissed without evidence.”
Dimples like golf balls. Ain't computer modelling grand!
(Computer modelling actually allowed people to make the first ever bell with an absolutely clear tone -- a couple of thousand years of people making bells, and it took a guy with a PC to make a perfect one, without ever being in the same room as a bell.)
I wanna be a eunuchs developer! Pass me a bread knife!