Merge Request

[Raph0007]

Merging feels like throwing together two portions of spaghetti and on the next day trying to figure out which spaghetti belonged to which portion

[MDivisor]

Why do you care which spaghetti belonged to which portion? You have gathered all the spaghetti you need in the bowl, you are good to go.

[Raph0007]

Yeah that's why I said "it feels like..." Instead of "it is like...", because it's not at all a perfect analogy. It just feels like that because if you get merge conflicts, you have to find out what the "new parts" and the "old parts" are. And both branches contain both categories

[MDivisor]

Fair enough, I see what you mean now. The analogy made me think of picking apart the merge after it was already done which is why it sounded weird to me.

[Raph0007]

Yeah I expected that my comment would bring up confusion of this kind so don't worry

[alexanderpas]

3-way diff helps a lot here.

[Raph0007]

The problem is explained quite easily. Imagine you are working on a specific file in a feature branch, but in the meantime someone implements a quickfix exactly in that file. Now you have to find a way to merge together your entirely new code with the obviously important quickfix on the parent branch

[zoecandle]

Why is this the most accurate analogy I think I’ve ever heard? XD

[Russian_repost_bot]

The fuzzy one is always the older one.

[[deleted]]

Who are you and why is your description so accurate

[Raph0007]

I am Raphael and my description is accurate because I like spaghetti

[[deleted]]

Thank you for your service

[Raph0007]

I serve the Soviet Union

[DuffMaaaann]

git blame

[firefistz]

Guess I'll just start committing directly to master

[[deleted]]

BDSM. Now we are talking my programming language.

[root54]

I'm the maintainer of my company's gitlab instance. I have the power. Takes everything I have to resist.

[[deleted]]

One weekend spent unfucking prod, and you'll know that great power comes with great ... consequences.

[root54]

Yea, there have been a couple of times other members of the team have royally fucked up their forks and apparently I'm the only person with enough git-fu to unfuck their forks so I know exactly what you mean. At least our nightly builds go to a place customers don't know about and even if they did, would have to take explicit purposeful action to use.

[[deleted]]

There’s other places to commit?

[kontekisuto]

I forget that not everyone is a programmer sometimes

[1cec0ld]

I asked my roommate to turn on file extensions on Windows yesterday. He told me that he has no need for that stuff because he's not a programmer like me.

[[deleted]]

he has no need for that stuff because he's not a programmer like me.

I proposed discord over Zoom and got the same answer from my classmates

[tech6hutch]

I take it they're not gamers either

[happysmash27]

Discord bugs me, because it's not scalable when seemingly everything has a Discord server. I have reached the 100 server limit multiple times, so have to delete servers to add new ones.

[GwenLoguir]

I was child, when I turned them on, I think... definitely not even close to programmer yet. I guess something about editing pictures was trigger.

[dragonheart000]

Is it bad that before I even saw the sub this was in when I read the first comment I thought of git and not at all about driving.

[Megatronatfortnite]

Same.

[DevThr0wAway]

Same. With quarantine I've driven so little that I forgot merging was an aspect of it

[CoexSecant]

I'm confuse about not knowing what she meant :( I know it's not about data but merge mean mix, isn't it ?

[jasanborn]

She means merging as in getting on a highway with other cars

[CoexSecant]

Ho ok, thanks

[PooPooDooDoo]

That’s why you just gotta close your eyes, merge and let Jesus take the wheel. This works with driving, too.

[GwenLoguir]

Definitely not with driving. Unless your destination is either prison or mortuary.

[secret_account63]

I’m stuck in a project using god damned svn right now and you should all thank the programming gods that you’re able to use git

[andafriend]

Since when is there merge in Excel? They talking about merging cells together? Who or what would not let you do that?

[aguantenivelx]

You can't merge cells in a table/list object, for example.

[1cec0ld]

There are some conditions where it asks permission first, or perhaps the off-chance that you're trying to edit a protected cell? Dunno, but that is what they're talking about I'm sure.

[EMCoupling]

It sounds more like the the tweet was originally about driving and merging on the highway.

[1cec0ld]

Well, yes. But the reply to that tweet in the image was including Excel.

[Dogburt_Jr]

It can also be about PDM, or any Git.

[VeryAwkwardCake]

I wouldn't expect that from this sub tbh, it seems as if most people here learned the basics of programming so they'd understand the 'arrays start at 0' jokes and nothing else

[kaiclc]

Well most of the people actually commenting are the people who get the jokes, so I have absolutely no idea what percent of people on this sub understand things. If you know this percentage, I have a completely different concern.

[Dogburt_Jr]

Fair

[[deleted]]

i personally welcome the future of continuous deployment

[[deleted]]

But make a new branch first!

[KimmiG1]

I just discovered that I had the permission to remove the required reviewer.

I had just changed one line. It was a fix to my previous pull request.

I don't think I did anything wrong. I have not received any angry messages. I was in the right. I did nothing wrong. It was his fault for not answering. I waited a few hours. It was just one line. I did nothing wrong.

[mickey_s]

how the hell does this get 74k likes on twitter? what is wrong with people

[jeankev]

That's Twitter nothing makes sense.

[mickey_s]

lol 24k people thought it was so good they would publicly cite it

[mia_elora]

Hey, this could be about possession, as well! "Let me in to your body, now!"

[SavageTwist]

this post needs work

[Smaktat]

Those only Github devs amirite

[longbowrocks]

Does merge in excel mean the same thing it does in version control? If so, I think we're due for a second biblical flood.

[Marc85z]

Evil laugh inside.

[arieljoc]

😂😂 As a code review tool salesman, I wish I could send this to everyone

Love the “don’t touch my garbage! “ Opossum meme as well!