Oh boy, I've seen better days

My girlfriend's mom has breast cancer, which started spreading. My grandpa has leukemia and I need to finish my masterthesis this month... I'm sorry to bother you guys with it but I'm really not sure how to hold my shit together any longer...

Yesterday I had to merge new features. As these have been developed by one developer, I thought "hey, that'll be no problem". Little did I know that every one of the 6 branches had merge conflicts *sigh*. These merge conflicts were so severe, that there where sometimes two methods in the same class with the same name doing different stuff in each branch... Normally I would tell her to fix her stuff but as she is on vacation right now, I had all the fun resolving the conflicts of code I hadn't written and repairing the failing unit tests she wrote.

The best thing is that our software will be featured in one of the most renowned business magazines at the end of the week while simultaneously being presented at a congress in Berlin in front of over thousand of potential new customers. So these knew features have to be running stable in production by then... Needless to say I had a great day yesterday and will have an amazing upcoming week 🎉

!rant

Lovely and thankful clients do exist!

Last week the client of our last project came to my desk to shake my hand and thank me for my well done work. Keeping in mind that I'm a junior dev and our company has around 3000 employees I was really flattered :)

We needed a design for our Android and iOS App, everything should be done by an award-winning design agency. What we received was only a design for iPhone X. Only mockups as PDF, no icons, nothing. So we requested the Android design and an iPhone 8 one including icons, color codes and whatnot.

1 FUCKING MONTH LATER we got the new designs... They are all the FUCKING SAME DESIGN where some mockups were "displayed" on an android phone, and some on an iPhone. Still no icons though.

3 weeks pass and we geht FUCKING sketch files, to extract the shit ourselves. Thank you for nothing.

It took again nearly 3 month to get a "proper" Android design and all the assets. You could clearly see, that they never did anything for Android but well, we had to work with it. Award-winning design agancy my ass.

Testing on the hot-standby server in the production environment