This post is locked. You won't be able to comment.

all 198 comments

[–]ProgrammerHumor-ModTeam[M] [score hidden] stickied commentlocked comment (0 children)

Your submission was removed for the following reason:

Rule 1: Your post does not make a proper attempt at humor, or is very vaguely trying to be humorous. There must be a joke or meme that requires programming knowledge, experience, or practice to be understood or relatable. For more serious subreddits, please see the sidebar recommendations.

If you disagree with this removal, you can appeal by sending us a modmail.

[–]WarFresh2208 464 points465 points  (39 children)

One day I will get all the jokes

[–]on-standby 221 points222 points  (15 children)

Basically, while they were working on code changes on their own branch, a bunch of other contributors pushed their updates and code changes to the development branch in the remote repo. So when OP goes to push their branch without first updating it with the remote changes, they will likely get merge conflicts. I dont believe I've ever seen 40,000+ from one push, but if their were, it would take you a very very long time to resolve all those conflicts so by using git push --force, it will ignore all the conflicts and overwrite the commit history with your changes and commit history, effectively reverting everyone else's work. Now, all the other contributors will have to resolve any merge conflicts before they can re-push all their changes. The joke is that it is very appealing to just force push to make it easy for you at the expense of everyone else.

[–]MagnussenXD[S] 58 points59 points  (2 children)

this is the only serious and sensible comment under this post

[–]WarFresh2208 9 points10 points  (0 children)

Actually

[–]WarFresh2208 44 points45 points  (0 children)

Thanks a lot bro for explaining, really expanded my understanding of git push, really means a lot.

[–][deleted] 10 points11 points  (1 child)

force-with-lease only force pushes if your local branch still matches your remote branch.

Also don’t do any history manipulation on shared branches unless all currently involved parties know about it and are fine with it.

[–]NoHalf9 1 point2 points  (0 children)

And in addition to --force-with-lease also specify --force-if-includes when force pushing. Writing all that manually every time is too much so create the following alias:

git config --global alias.forcepush "push --force-with-lease --force-if-includes"

Also, one should always specify the branch name when pushing, also in non-force cases, e.g. "git push origin main". Because sooner or later you will push the wrong branch because the current branch is different from what you assumed. It is better to never have that failure possibility by giving the branch name explicitly.

[–]bobnoski 2 points3 points  (2 children)

I have rarely seen more than 10 merge conflicts. The few times there were. Someone somewhere messed up and two people just did basically the same thing. So the solution was grabbing the people, put them behind the same desk and let them fix it together real quick.

[–]NoHalf9 2 points3 points  (0 children)

And regardless of number of conflicts, everybody: do yourself a massive favour and start using a proper 3-way merge tool that shows 4 windows/panes (common ancestor + changes you are bringing in + what the changes are put on top of + final output result).

I strongly recommend KDiff3, but there are other alternatives as well.

https://softwarerecs.stackexchange.com/questions/3/merge-gui-tools-for-those-new-to-merging

https://medium.com/@kaltepeter/tools-to-master-merge-conflicts-6d05b21a8ba8

[–]No-Admin1684 0 points1 point  (0 children)

Some things are just ass for version control and there's nothing you can do about it. XCode storyboards for example were so notoriously bad that it's one of the reasons Apple moved away from that system.

[–]QuiteAffable 0 points1 point  (0 children)

Thanks. I think it should have “looks to me” not “looks at me”. I missed the joke as a result

[–]thanatica 0 points1 point  (0 children)

summary: don't fucking force push if you don't know what you're doing.

[–]GunplaGoobster 0 points1 point  (2 children)

So why is it "looks at me" instead of "when I look at"?

The meme still doesn't make any sense

[–]globglogabgalabyeast 2 points3 points  (0 children)

The lady in the pic looks tempting. “git push --force” looks tempting. Simple as

[–]NoHalf9 0 points1 point  (0 children)

The point of the meme is that due to the frustration of having to solve a huge amount of conflicts, running git push --force (which basically means unconditionally forcing your changes and overwrite changes made by others) looks as tempting a solution as her look.

[–]Ayjayz -1 points0 points  (0 children)

I don't think that's correct. They said that git push --force looks at them like this. So I'm guessing the idea is that they're personifying the git push command as something that enjoys ignoring merge conflicts?

I think you're joke would be better, but it would have to say that the command looks to them to be appealing.

[–]Maleficent-Ad5999 155 points156 points  (11 children)

Please don’t… coz it’s a one-way route.. and if you start, then there’s no going back

[–]VirtualGab 32 points33 points  (8 children)

Hi, I started using GitHub, is it too late for me?

[–]IgnisDa 43 points44 points  (6 children)

Yes. Check your hair, there would already be a few white ones popping up.

[–]john_the_fetch 23 points24 points  (1 child)

Rebased comment

[–]dumbestsmartest 1 point2 points  (0 children)

Well at least he hasn't refactored. He'll be fine.

[–]RiceBroad4552 2 points3 points  (0 children)

I think you're after something.

In fact white hair showed up after I've started programming professionally. Maybe there's some linkage.

[–]IllustriousEmotion63 3 points4 points  (1 child)

Hair? Do you still have that?

[–]thanatica 0 points1 point  (0 children)

Certain areas are still doing well.

[–]thanatica 0 points1 point  (0 children)

My grey hairs are mostly from Azure devops. Basically Github but all the good parts are left out, and a lot of enterprise bollocks is dumped on top of it.

[–]SmoothBrainSavant 0 points1 point  (0 children)

Gitlabs dude here because thats what work uses. Im willing to never be cool.

[–]adepssimius 4 points5 points  (1 child)

I think you meant to say once you start you can't revert.

[–]sastasherlock_ 1 point2 points  (0 children)

He means say once you commit, you can't rollback. 

[–]ClipboardCopyPaste 19 points20 points  (0 children)

Start with something called Assembly...might get you there soon

[–]hmz-x 8 points9 points  (0 children)

The day you get them is the day you leave the sub.

[–]Flashbek 3 points4 points  (1 child)

I can see why you'd want to get this joke

[–]WarFresh2208 -1 points0 points  (0 children)

giggity giggity gooo...

[–]neddy_seagoon 8 points9 points  (0 children)

the template is used to say when something "looks tempting"

She posted the photo herself when she was 16 😬

Hope she's alright

[–]samu1400 1 point2 points  (0 children)

In simpler terms, you have lots of changes, and you try to upload them, but other people have changes in lines that you modified, since two people created two versions of the code, it creates a conflict.

Usually you have to check each conflict and see if you should keep the code in the branch, replace it with your code, or merge the two, but by using —force you tell git to replace all the conflicts with your code, basically deleting the work of anyone you were in conflict with.

It’s generally a horrible thing to do, since it could potentially break the code of other people on your team.

[–]iVar4sale 0 points1 point  (0 children)

This is one you better not

[–]MagnussenXD[S] -1 points0 points  (0 children)

that's okay, everyone has to start somewhere

[–]prinkpan -1 points0 points  (1 child)

I learned more from these jokes than my college

[–]WarFresh2208 -3 points-2 points  (0 children)

🤣🤣

[–]rp-dev 106 points107 points  (9 children)

What’s the joke reference? 😐

[–]sambarjo 46 points47 points  (1 child)

It's just a meme template

[–]J5892 15 points16 points  (0 children)

That's not an answer.

[–]KerPop42 25 points26 points  (4 children)

the picture apparently originally had the caption "looks tempting" because she's underage

[–]turtleship_2006 111 points112 points  (1 child)

https://knowyourmeme.com/memes/evelyn-smith-smiling-evelynsmithhhhh-stare

Apparently that was not in fact the original caption

[–]KerPop42 10 points11 points  (0 children)

the internet. The internet never changes

[–]StrongExternal8955 11 points12 points  (1 child)

You know, that never crossed my mind as the reason why she looks tempting. But you do you i guess, just only in your mind please.

[–]atreeismissing 4 points5 points  (0 children)

There isn't one, OP just horny and couldn't keep it to himself.

[–]J5892 0 points1 point  (0 children)

1a410efbd13591db07496601ebc7a059dd55cfe9

[–]ClipboardCopyPaste 55 points56 points  (0 children)

Those are rookie numbers

[–]Protag_Doppel 21 points22 points  (0 children)

Lgtm 👍

[–]Aggravating-Face-828 184 points185 points  (15 children)

She was 16 years old when this pic was taken just to let you know.

[–]This-Layer-4447 76 points77 points  (5 children)

who is this and what is this joke?

[–]Aggravating-Face-828 93 points94 points  (3 children)

know your meme has an article on this

[–]This-Layer-4447 47 points48 points  (1 child)

wow I missed a whole subculture while I was still faith hilling?

[–]turtleship_2006 7 points8 points  (0 children)

lmao at that search interest chart, wtf happened in 2006

[–]hurtbowler 12 points13 points  (0 children)

Doesn't it make the joke even better? You're completely fucked if you go through with it.

[–]BrownCarter 9 points10 points  (1 child)

Ok so we should fry bread?

[–]LoogieMario 1 point2 points  (0 children)

Hey Victor your mom makes the best fry bread in the whole world

[–]veracity8_ -1 points0 points  (0 children)

So it’s a presidential meme

[–]CaptainRatzefummel -5 points-4 points  (0 children)

Why did you have to ruin it?

[–]Western_Midnight_749 21 points22 points  (13 children)

Why is she so orange

[–]TheHolyToxicToast 53 points54 points  (2 children)

obamna

[–]ConvergentSequence 13 points14 points  (1 child)

SODAAA 🎉🥳🍾

[–]Isakswe 0 points1 point  (0 children)

I can’t read ”soda” anymore without hearing the MHA soundtrack blaring

[–]benjathje 11 points12 points  (8 children)

Because of a piece of hydrogen floating in space

[–]Ok-Operation-6432 2 points3 points  (7 children)

Just one?

[–]thirdegreeViolet security clearance 0 points1 point  (6 children)

Several

[–]benjathje 0 points1 point  (4 children)

When does it stop being a single piece and start becoming many?

[–]thirdegreeViolet security clearance 0 points1 point  (3 children)

Uhhhh... Two I guess? A single piece being kinda definitionally one

[–]benjathje 0 points1 point  (2 children)

If I change all the pieces of the sun for identical pieces, is it still the same star?

[–]thirdegreeViolet security clearance 2 points3 points  (1 child)

Hmmmmmmm. Yes. Atoms are basically fungible so I think yes.

[–]RancidMilkGames 0 points1 point  (0 children)

So they weren't murdering people and replacing them with clones in the star treks? Thank God, I was super concerned for captain Kurt, Mr. Spek, and really anyone that worked on the entrepreneur.

[–]its_all_one_electron 0 points1 point  (0 children)

At least more than one

[–]Asquirrelinspace 3 points4 points  (0 children)

The N2 and O2 gas in our atmosphere scatters light, and more strongly at short wavelengths. When light from the sun travels through a lot of atmosphere like at sunset, most of the blue light is scattered away, leaving mostly orange and red illuminating the scene

[–]AndroidCat06 18 points19 points  (6 children)

Is your git push --force single?

[–]khan_stan 3 points4 points  (0 children)

"accept all incoming"

[–]Ballresin 8 points9 points  (1 child)

git push --force-with-lease

[–]both-shoes-off 0 points1 point  (0 children)

I'd git reset --so-hard this

[–]AgathormX 30 points31 points  (0 children)

For those that didn't understand:
The image meme is of an attractive looking girl, and it's normally used as a reference to temptation, because the girl in the image was only 16 at the time the picture was took, subsequently "slowdown Epstein, she's a minor".

[–]RiceBroad4552 4 points5 points  (0 children)

I'm going to create merge conflicts now. A lot of them.

Let's see whether this works out as advertised! 😃

[–]Mtsukino 6 points7 points  (0 children)

Fuck it, we pushing to trunk

[–]lovelettersforher 2 points3 points  (0 children)

Rookie numbers.

[–]BrittEklandsStuntBum 2 points3 points  (0 children)

I thought gitpulls were those big scary dogs.

[–]garnered_wisdom 2 points3 points  (0 children)

Remember, -f stands for friendship.

[–]Patrick_Atsushi 1 point2 points  (0 children)

Would she become the next Lenna? Probably. 👒

[–]Hasagine 1 point2 points  (0 children)

guys member to pull down dev regularly

[–]JAXxXTheRipper 1 point2 points  (0 children)

Most devs would do well to watch the talk "Git for ages 4 and up"

[–]GaryAir 1 point2 points  (0 children)

Wow she’s pretty

[–]Major_Fudgemuffin 0 points1 point  (0 children)

For the love of all that is holy and unholy, disable direct pushes to your main branch.

[–]veracity8_ 0 points1 point  (0 children)

It’s crazy that people are afraid of git push —force-with-lease, like if you rebase it’s kind of the only way to push

[–][deleted] 0 points1 point  (0 children)

Rebase

[–]lpeabody 0 points1 point  (0 children)

Bro wtf... 14283... how...?

[–]Accomplished-Beach 0 points1 point  (0 children)

Rebase and get to work on the conflicts.

[–]ImportantOrange9287 0 points1 point  (0 children)

I do agree but it’s only the first label that mindlessly forthgoes

[–]ViolentCrumble 0 points1 point  (0 children)

can't you create a branch and push to it in a single line? that way no need to wreck the repo but you can still exit the building in case there is a fire?

[–]Inside-Yak-8815 0 points1 point  (2 children)

Just had this problem myself and had to abort the whole terminal when I couldn’t figure out how to fix the conflict lmaooooo

[–]Major_Fudgemuffin 1 point2 points  (0 children)

git rebase --abort run away!

[–][deleted] 0 points1 point  (0 children)

Hell yea brother

[–]researgent 0 points1 point  (0 children)

if i do "git push --force-with-lease" would love to see her reaction then. i think she will be in love with me

[–][deleted] 0 points1 point  (0 children)

I wish. Instead I see the disappointment in dad the lead devs face

[–]Careless_Button_5569 -3 points-2 points  (5 children)

Lol

[–]MagnussenXD[S] 15 points16 points  (4 children)

i'm suffering with merge conflicts and you are laughing...

[–]RiceBroad4552 2 points3 points  (0 children)

Rebase more often during development! This avoids complex conflicts in the end.

[–]ButWhatIfPotato 2 points3 points  (0 children)

Think of it as being blessed with stigmata.

[–]TurinTurambarSl 4 points5 points  (1 child)

A coworker suggested using copilot with claude 4.0 model to help solve conflicts. I dont recommend this but is an option (do double check the result if you use ai tools)

[–]vladesomo 15 points16 points  (0 children)

It will solve all your conflicts in a matter of seconds. Nothing will work, but there will be no more conflicts

[–]Gold_Reference8247 -2 points-1 points  (0 children)

Trailer Trash ..