First I wanna say how grateful I am that devRant exists, because my friends either don’t understand this vocab or don’t care lol.

Last week I worked on a pretty large ticket, opened a PR with 54 file changes. Just to follow standards I set the PR milestone to a future release version, but the truth is I didn’t care which version this work ended up in— I just needed it to go into the develop branch asap.

Since it was a large PR there was some expected discussion that prolonged its merging, but in the meantime I started a second branch that depended on some of the work from this branch. I set the new branch’s upstream to develop, fully expecting my PR to merge into develop, since that’s what I set the PR base to.

I completed all the work I could in the new branch, and got two colleagues to approve the initial PR so it would be merged into develop, I could add the finishing touch and get this work done seamlessly before the week was over. They approved, it got merged, I pulled develop, and… my work wasn’t there. I went to look at my PR and someone had changed the base branch to a release branch. It was my boss, who thought he was helping. (Our bosses don’t actually work on the same team as us, so he didn’t know. it’s weird. We have leads that keep track of our work instead.)

I messaged him and told him I really needed this in develop, knowing our release branch won’t be in develop for probably another week. I was very annoyed but didn’t wanna make him feel too bad so I said I’d just merge the release branch into my new branch. So many conflicts I couldn’t see straight. His response was “yeah and you’ll probably have a bunch of package manager conflicts too because that’s in that release.” He was right— I have so many package manager conflicts that I can’t even see how many compiler conflicts there are. I considered cherry picking my changes, but the whole reason I set develop as my upstream was to avoid having any conflicts since I’m working in the same functions, and this would create more.

So I could spend the next (?) days making educated guesses on possibly a thousand conflict resolutions, or I can revert my release branch merge and quietly step back and wait for the release branch to be merged into develop.

I’m sure cherry picking is the best option here but I’m genuinely too annoyed lol, and fortunately my team does not care to notice if I step back and work on something else to kill time until it’s fixed automatically. But I’m still in dire need of a rant because my entire plan was ruined by a well-meaning person who messed with my PR without asking, so here is that rant and I thank you for your time.

So.. I'm giving one of my employers webapps a visual refresher, new company branding and whatnot.

And then I stumbled onto a check that is not returning what anybody expects, and, well , I'm busy fixing things, yeah..? so I go digging.. 🤔

```
function isDefined(obj) {
return !(typeof obj === "undefined") || obj !== null;
}
```

Here's the fun part, these particular lines have been in the code base since before 2017, which is when my Git history starts, because that's when we migrated projects from Visual SourceSafe 6 over to Git. Yes, you read that right. They were still using VSS in 2017.

I've begged and pleaded with my last 3 bosses to let us thrown this piece of shit out our second story window and rewrite it properly. But no, we don't have time to rewrite, so we must fix what we have instead.

I lost 4 hours of my life earlier today, tracking down another error that has been silently swallowed by a handler with its "console.log" call commented out, only to find that it's always been like that, and it's an "expected error". 🤦

Please, just fucking kill me now... I just, I can't deal with this shit anymore.

When Elden Ring come out I ignored it, I was jobless, no money, game was expensive and I got into hate relationship with it.

Some time ago I launched twitch and saw that DLC come out. Struggled between buying or not because it reminded me my struggle with money.

Found that shop in my city sells box version of Elden Ring with DLC for PS5 and they have last one in their store.

I reserved it online without payment and it wasn’t immediate, I started thinking that someone bought it and I won’t play it. Felt happy I won’t spend money on game I hate.

Two hours later I got email that product is ready for picking up and it meant it will be rush hours when I go get it and didn’t liked it.

I work remotely and I’m not used to seeing many people, but well I wanted to play the game if it’s waiting for me.

After I arrived to the shop and went in I met the most honest guy who is selling games.

He asked me if I am souls fan. I said I never played souls game.

He asked three times if I really want to buy this game because it’s hard.
Told me he approached it 3 times already and didn’t stand a chance.

After chitchat I bought the game, paid cash because I love box games and cash anonymity.

Woman cough on me when I was on my way back, I said to myself fucking hell I’m going to be sick and I am starting my vacation next week.

I got really sick with a flu, played straight 2 weeks, I don’t have playstation plus so I can’t read any clues or play online but I don’t care.

It’s even better because you can enjoy more of the world not reading messages like you’re on gaming forum instead of playing game.

Dying from sickness helped me to don’t care about dying in game.

Two weeks later here I am, just killed Mohg and unlocked DLC on my ps5.

In achievements it says that only 38.5% of people killed Mohg.

Now I sit and wonder how many people bought DLC and will never play it because they can’t kill Mohg.

I love Elden Ring now. One of best games I played to this day.

The timing for it was perfect, the sickness, the game, one of the best vacations and one of the best journey in my life.

To whomever organized that adventure in my life.
Thanks, now it’s time to kill some more bosses.

What if all devs worked together to create a programmed God which only obeys devs? And hates bosses....
I think we can do it guys!

Ps. Bagsie not dealing with merge conflicts.