Nightmare IRL:

Your colleague is in PTO for 2 weeks.

You are in charge of maintaining his project along with yours, CI, code, tests and everything.

Your colleague's code base is a real master piece of shit when you look at it closer. By shit, I mean hardcoded values everywhere, random sleeps now and then, 20 if branches that could be replaced by maps, variables named a b c d everywhere, try catch to silence errors that should not be silenced, etc.

Your colleague left the CI and code broken as shit. Takes forever to run on my goddamn computer.

PMs are spamming you: "What is going on? It's red everywhere. Help! Plz fix this! We are going to release tomorrow!"

FML

Okay, wait, is it a common practice to push changes to master that you KNOW break some other features? I always assumed that that's what branches are for and master should be the "to the best of our knowledge it should be production ready"? But apparently in this company you need to hunt for the right revision, interrogating people why suddenly nothing works on your end and half the time it's "oh, this guy has been working on something and it broke half of the stuff others have been working on and isn't covered in tests yet. Use revision 21xkcd7a"

what a garbage day. i've spent almost the whole day merging shit and the rest was meetings (also talking about how i merge shit).

dear fucked up branching strategy, when I look at the torn beauty of your mutated stream graph that carries the taint of corruption, depictions of feculent gnarlmaws come to my mind:

"These disgusting trees ring with the sorrowful tolling of entropic chimes, belch clouds of daemonic spores, and shed rot-wet blossom to carpet the maggot-churned earth beneath their boughs. The few stunted branches that grow from it feature dismal bells, tentacles and more pustulent boils."

You know what fuck github , anyone remember when git cli was easy and straight forward to use

Now i have conflicting master branches because the remote is main and git automatically defaults to master.

Git still asks for a password while github can't wait to inform me how I have to go through the very long process of setting up an auth_token.

Apparently https remote origins for some reason don't work anymore, why because apparently i need to change them into ssh, good luck with the public key errors

This sucks , fuck github and fuck politics

Today I could finally spend some time reviewing the merge requests an intern made (and I occasionally helped).

My god, I want to put it this months amount of work an, put it in a trash, burn it and rewrite it before the fire is gone.

5 small and unrelated issues. The intern used branches with the correct naming scheme, but IT'S A FUCKING STRAIGHT LINE BUILDING ON TOP OF EACHOTHER.

Oh ans also they took the liberty to update the dependencies and the language versions used. There was no issue regarding this. It's the first branch in the line and it was called "update_<dependency>" where they just upped the version numbers of everything and then COMMENT OUT all mentions of <dependency> so that it compiles at the very least.

Now today I spend most of my time reviewing the code by fixing that mess. Thanks to updates I had to update the CI and replace some libraries that are now incompatible. Tomorrow I can finally inspect the shit itself.

On a positive side node, I removed node as a dev dependency and the size of the node modules went down from 128mb to 18mb

What a joy working in a company that uses git as if it's subversion (dev branches? What are dev branches?) paired with gerrit. Getting a single, crucial change pushed to the actual repo can take days. The speed of the site can be measured in geological epochs. The interface has a charm of windows 95. Half of the builds are broken. Life is fleeting and I'm wasting it here.

What’s going to f up my career from here on out is Git. I’m constantly needing assistance from others with it because I can never keep everything straight in my head with what’s going on “in there”. It’s always getting tangled up like old fishing line and I just have to cut the line and start fresh again. I honestly feel so stupid compared to other people who don’t have a problem with it. My brain just can’t keep track of all the different states local, branches, and master can be in at any given time, and across more than one developer. I’m probably alone so, yeah, go ahead and roast me. I probably deserve it for being so perpetually gobsmacked by it all.

GitHub defaults to only allow squash merging feature branches, and suggests that it is "safe" to delete the feature branch that contains all the detailed commit messages at the place where they belong. Losing history, plus creating unnecessary "conflicts" after continuing to work and adding fixes to the same feature branches later.