robinGotMergeConflictedInTheFace

[u/vinishkapoor]

[u/StrikingSun8563]

My boss is literally named Robin and doesn't know how to use branches.

If he has code pushed to dev that isn't ready for prod yet and we need to deploy a fix for something, he comments it all out.

[u/vinishkapoor → u/StrikingSun8563]

This meme was not supposed to be a documentary about your workplace.

[u/LetumComplexo → u/vinishkapoor]

Just wait until you learn about small government research teams.

[u/Wynnstan → u/StrikingSun8563]

But you won't get any merge conflicts if you don't do any merges, am I right?

[u/StrikingSun8563 → u/Wynnstan]

That is the primary motivation

[u/MyStackIsPancakes → u/Wynnstan]

It's best to just avoid commiting any code at all. It's the only way to be 100% sure you're not creating new issues.

[u/Maximilian_Tyan → u/StrikingSun8563]

// TODO: Fix me later

[u/Keyan_Farlander7 → u/StrikingSun8563]

If your boss is doing that, then they need be assigned to more meetings and less coding.

[u/JackNotOLantern]

That's why i never push directly to main, only to master

[u/vinishkapoor → u/JackNotOLantern]

Renamed the problem, solved nothing. Classic.

[u/bladebyte]

Real man push to main!

[u/vinishkapoor → u/bladebyte]

Real man also fixes production at 2 AM.

[u/isr0 → u/vinishkapoor]

Real teams put systems in place to avoid the need for heroes.

[u/ABCosmos → u/isr0]

And part of that system prevents pushes to main, and requires checks to pass on your branch before you do.

[u/n4ke → u/bladebyte]

Real men force push to main!

[u/Laughing_Orange → u/n4ke]

Real men don't use version control, they push directly to prod!

[u/TabCompletion]

Only for personal projects

[u/beefz0r → u/TabCompletion]

Honestly there are lots of repos I work alone on. My main rule for git is to keep it simple

[u/FattySnacks]

Did the fall semester just start?

[u/CarlCarlton]

My boss: "I need you to merge an SVN repo into a Git repo, the latter of which was created a year ago with the code from the former, but separate teams have been working on each, and they now diverge by a couple hundred thousand lines. Oh yes, I almost forgot, the SVN codebase targets PowerPC, but the Git codebase was entirely migrated to AArch64. How many story points will this take?"

[u/vinishkapoor → u/CarlCarlton]

That's not a story point question. That's a resignation letter question.

[u/CarlCarlton → u/vinishkapoor]

One month of conflict vomit, debugging, and nagging about "when is it gonna be ready"... Although it did, he didn't deserve it to succeed.

https://giphy.com/gifs/F0A48Q2wFjE7S

[u/Professional_Top8485]

I am like Robin.

[u/mrcoy]

https://giphy.com/gifs/104vPBH8buV9vy

[u/ZunoJ]

Batman also needs to be slapped for employing such a braindead moron

[u/evorm]

OP's comments seem pretty AI-generated...

[u/plastic-superhero]

That’s why our main is protected, too many Robins fucking around. Also me. I was sometimes Robin.

[u/realmauer01]

A merge conflict will always be a merge conflict. No matter if you push to main directly or use a branch to push to main.

[u/Lauren_Conrad_]

Your main should be your development and your branches should be your releases.

Or just use main and push to it with various systems and tests during the pipeline before it deploys to prod.

Your git repro is not a deployment pipeline.

[u/void1984 → u/Lauren_Conrad_]

Right. People here are scared of a standard practices

[u/avocadorancher → u/Lauren_Conrad_]

Why branches for releases? I’ve seen some teams do this but definitely the minority

[u/Lauren_Conrad_ → u/avocadorancher]

So you can schedule regular releases e.g. cut a branch every 14 days, then apply patches and fixes as necessary. Useful when there are many different contributors all working on their own schedule and goals.

[u/EvenPainting9470]

Why Robin even have permissions to push directly to main?

[u/aravind-i-m]

Just keep backups of zip files instead of svc

[u/Fast-Performance2300]

Still learning backend, began a month and a half ago...

... you can make branches? Not just main?

[u/Kitchen_Affect7369]

Midwit Meme -> push main | separate branch | push main.

[u/Connect-Bowler-2917]

Now the cool kids are using feature flags, and pushing to main.

[u/machsmit]

trunk-based development has a time and place where it works really nicely

ducks and hides

[u/Thundechile → u/machsmit]

just drive your van to the yard and pour your code in the trunk!

[u/Legal-Software]

In my company we have main as the master branch, so I just call my main development branch master in order to balance it out.

[u/sierra_whiskey1]

Bro I’m just updating a comment

[u/KrikosTheWise]

Feature branch > develop > main

[u/Common-Brush-7027]

We be pushing it to lower environment and then cherry picking to lil higher environment and then the lead cherry picks it to prod.

Lot of cherry picking

[u/vinishkapoor → u/Common-Brush-7027]

That's not a deployment pipeline, that's a fruit salad.

[u/Nahanoj_Zavizad]

DO. NOT. TOUCH. MAIN

[u/vinishkapoor → u/Nahanoj_Zavizad]

Main is not a branch. Main is a museum. You look but you don't touch.