It's a merge conflict

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.

Are you ready for the only really useful advice on devRant that is not judgmental, simple, and instantly applicable?

Here it goes. If you have hiccups,
1. Inhale your full lungs until you can’t inhale anymore
2. Hold your breath as long as you can
3. Exhale carefully

This will “reboot” your breath cycle, and that conflict between breathing and other things that causes hiccups will go away.

Repeat if needed. Breathe slowly and carefully after you finally exhale.

Goodbye Duckduckgo, DuckDuckGo’s CEO Gabriel Weinberg announced on Twitter that his privacy first search engine will be manipulating its search results to only show users what the company deems not to be “disinformation” about the Russia-Ukraine conflict.

My friend is learning PHP and I told him to install xampp but that fucker went nuts and installed MySQL too which didn't allow the xampp's SQL and ended in conflict.
Oh man that's so funny when non programmers don't do what we say.

Almost a year and a half. I was so overworked and my failures were so impactful. I would go home and obsess over work all evening and have fever dreams on nights that I could sleep. It was so mentally painful that I was going to jump off a building after a few drinks to make it stop. A military turned civilian doctor told me that I showed symptoms like soldiers in prolonged conflict. He told me “quit or it will kill you” without even knowing about the suicide stuff. So I quit the job and to this day still suffer flashbacks and have crazy mood swings.

Burnout is real. Dangerous stress is real.

O Friends, It Is Great To Be Writing To You Again. Let Me Share With You A Most Amazing A Tale! I Have Spent Some Time Now In CapitalizedCamelCaseLand. It Is A Glorious Land, Where All Written Word, Language, and Culture Is Governed By The Almighty CapitalizedCamelCase. The People Are Productive And Extremely WellTyped (A Phrase They Charish And Use To Mean General WellBeing).

The Honorable Citizens Of CapitalizedCamelCaseLand Have But Few Fears... And I Shrink To Speak Of Them Or Even Write Them Here, As It Is A Heinous Crime To Even Mention Or Write These Words... But I Must Report, As It Is My Duty... So, Their Fears: The Horrible And Most Repellant lowerCamelCaseJavaScriptianDevils, Or Even Worse, The Grisly And Ghastly snake_case_fiends_of_pythonia!!! O My Friends How It Fears Me To Even Form Such Foreign And Strange Characters And Symbols That Remind The Citizens Of CapitalizedCamelCaseLand Only Of Pain And Suffering!

Many Wars Have Been Fought Upon The Lands Of Both JavaScriptia and Pythonia (The Cultural And Correct Way To Refer To These Harsh Lands In Respectable Company), But To No Avail Or Final Stop To The Fighting. While CapitalizedCamelCaseLand Is Currently In A State Of General Peace And Prosperity, There Is Surely A FlareUp Of Conflict To Occur Against The JavaScriptianDevils Or The PythonianSnakeFiends!

For In DevWorldia (The Name Of This Strange Planet I Report From), There Has Rarely Been A Time Of Peace Lasting For More Than About 5 Minutes, Which The Citizens Of CapitalizedCamelCase Assure Me Is Already A Massive Length Of Time And Achievement To Be Cherished.

Alas, I Beleive In The Coming Days I Must Travel To The FarAway Lands Of JavaScriptia And Pythonia. I Can Only Hope That I Am Also Treated With Kindness And Respect In Those Lands By Attempting To Emulate Their Ways, Just As I Have Here In CaptializedCamelCaseLand. I Hope To Write To You Soon And Wish You Well.

Signed And Sincerely,

Language Traveler FullStackChris

!dev

God I’m having the hardest time focusing on my task, it just seems so inconsequential compared to the shit going on in the world.

Here in my own country we’ve got issues with the government and their desperate grabs at power, citizens rights being trampled all over as if they mean nothing.

Of course the conflict in Ukraine I can’t peel my eyes away from the Reddit world news feed.

The explosive inflation worrying about the cost of food fuel and rent.
Diesels not cheap, and the electric company wants to spike up the price of already over priced electricity by 10%.

I’ve got a trip coming up which I’m thankful for but it’s expensive and money isn’t getting any easier to come by.

I’m genuinely worried about what the WEF is attempting to accomplish and the amount of power they hold over the western world.

And with all that in my mind…. The work in front of me of updating this stupid game to modern standard and refactoring it to actually make sense and be maintainable… just seems so fucking pointless.

Two reviewers two comments on the same content, both comments conflict with each other and I'm required to apply both, how exactly?

When you are right and in conflict with someone on some topic and they don't have guts to accept their mistakes but only to shame you for some reason, bring them down and fuck them up

I need some help. I have a 1 months old MR in gitlab with 5 commits of a feature that I have to revert.

I have hard time understanding how to solve git revert conflicts and frankly this three windows GUI on intellij idea is very confusing to me. I am like afraid that I will accept a bad change or miss something.

Is there any other way to make this merge conflict solving easier? I was thinking maybe I could just rebase to head where I added my commits, revert them without conflicts and then rebase that branch on latest develop?

In that case I would be solving merge conflict by adding stuff instead of removing old stuff and being afraid that I will mess up something. Goal is to create a revert feature MR.

Question about scrum in terms of developer/QA workflow. We have a problem in our team: basically when a dev submits an MR it needs to get 2 approvals from devs and then task is marked ready for qa. Now problem here is that qa takes 2-3 weeks to get to the task and when they do usually MR has merge conflicts and since QA are quite new-ish they have to wait for dev for conflicts to be resolved, ergo rendering the MR unable to be tested until dev resolves the conflicts.

Our teamlead proposes to solve this by forcing devs to rebase everyday (even if QA will get to working on the task 3-4 weeks later). Problem with that approach is that each conflict resolve removes approvals. So I had a situation where in 3 weeks I rebased like 15 times and 5 times I had resolve coflicts and because approvals were lost I had to annoy all devs and ask for reapprovals. And this is only with 1 MR. Now imagine all devs doing rebasing daily and spamming each other for reapprovals. Its not efficient.

Anyone could advice how to solve this issue?

GitKraken is a piece of shit, there’s no other way to word it.

I’ve been working on a branch on my own for a while committed most things I did except the very last things. Since the branch was quite old I decided to rebase onto develop to be more up to date. So for the modifications I didn’t commit I stashed them, then I started rebase, thinking it was done I poped my stash. Then I saw there were rebase conflict so I pressed cancel rebase thinking it would just revert to the state before the rebase. BUT GOOD LORD NO, YOU GOT IT ALL WRONG…

No it just deleted my stash in the process as well 🤦‍♂️

May this work be done in a spirit of generosity, not driven by ego, greed or delusion.
May kindness sustain us and prevail in conflict
And compassion guide us and lead us to understanding
May we rejoice in the success of other
And remain unmoved by praise and blame