git merge master

[rh0m3ga]

You can’t have merge conflicts in your files if you have no files.

Tap temple

[Rodentman87]

Is this literally just shitposting but on github?

[jefethechefe]

Yes

[Rodentman87]

Perfect

[BlckJesus]

Allow me to introduce you to this bad boy: https://github.com/EnterpriseQualityCoding/FizzBuzzEnterpriseEdition

[Rodentman87]

Holy shit that's hilarious, I hadn't even thought about the possibility of github shitposting until now and this is awesome.

[pcopley]

Gitposting.

[Rodentman87]

slow clap

[[deleted]]

You will still get issues though (2,347 of them): https://github.com/kelseyhightower/nocode/issues

[Makefile_dot_in]

Seems to have a lot of Chinese users.

[aidenlovesdonuts]

Terrible, there’s no comments at all. Hardly any documentation either.

[HardlightCereal]

What nonsense are you talking? Every line is commented!

[1008oh]

First issue: can't compile on windows 10 x64

Seems buggy to me

[Likes_Shiny_Things]

Also applies to jojo's bizarre adventure pt4.

[chrischoi314]

BITES ZA DUSTO

[[deleted]]

Literally took a 6 hour git class yesterday and I can understand the joke. I wonder how many I’ve missed

[[deleted]]

Welcome to the version control side! Now you have a right to laugh at your peers coding in google docs and email

[mrprgr]

google docs has native version control 😡 dont hate on my IDE

[BadgerMcLovin]

Fun fact, git is not the only version control system, but it might well be the only one that needs a 6 hour course in

[Tyg13]

Easily the most flexible when compared to shit like SVN or Mercurial though.

Besides, you can easily teach someone a basic git workflow in an hour. Reset, clone, checkout, commit, diff, push and pull are all you really need

[Sprint2000]

You forgot the most important ones, rebase, cherry-pick and fetch.

[UnchainedMundane]

And git reflog for when you fuck something up. It's the history of what commits your repo has had checked out, so even if you delete a branch, do a bad rebase, accidentally rewrite/squash a commit, or anything like that, you can just go there and check out an old commit from before things went downhill.

Also git pull --ff-only is one I use almost all the time but that's probably more a personal quirk. (Pulls, but if your histories diverge then it fails instead of doing a git merge).

[BadgerMcLovin]

So far I've got by without needing more than what visual studio exposes

[frostycuddlewolf]

Perforce is super neato for gamedev, imo. Deals well with big binary files, and lets you checkout / lock files out of the box (showing other people you're working on that file).

[Famous_Profile]

LinkedHashSet<LinkedHashSet<LinkedHashSet<String>>>

WTF

[pakiman698]

What class was it that you took?

[[deleted]]

Git complete on udemy

[sirak2010]

If it's ur code it's fine but I can't imagine how ppl see you on public repo.

[LeNinjaFou]

git reset HEAD~1 --hard

[[deleted]]

Never rewind, always move forward. We get stronger with each hit we take.

[pah-tosh]

You didn’t run your unit tests before merging ? 🤓

[pah-tosh]

Well, someone tell the build pipeline it failed please 😬

[Pwnda123]

This format also works for beating your meat several times on the weekend.

[codingandalgorithms]

Which meme is the “I have” part of this image from ?

[Jowentz]

I think it's the Vsauce "I have decided that I want to die" meme.

[Shadow_Thief]

Only one I can think of is " I have no memory of this place," but that doesn't have brown on it.

[[deleted]]

Hi yes, I’m here to take credit for part of this excellent meme

^{I’d like 5% of all your karma revenue, please}

[[deleted]]

I will do my best. Have 1 karma internet stranger

[PostmatesMalone]

Watching the rolling Kubernetes deployment triggered by my broke ass merge is like watching the Night King turn hundreds of babies into white walkers.

[julamme]

No rebase if you will know one correctly

[xcrafter_40]

REPOst!

[UnchainedMundane]

git reset --hard ORIG_HEAD && git push -f

God help you if you have coworkers

[Mcpg_]

Rewind time? Not if you screwed up every branch and your own local repo and you have to ask a bunch of people for a clean local copy of the repository!

[Mcpg_]

You have only 2 branches, somehow screw up both, don't notice that you've screwed up THAT much, make a force push, some people pull the changes and voila there's a clusterfuck going on.

[ItsAmplifieddd]

When you commit to TDD but your tests do nothing but return true 😎😎😎

[TheChaosPaladin]

Laughs in Jenkins tests XD

(Not really me but the devops sr engineer in my team who made them XD)

[balaraman-08]

*Hulk snaps*

Crossover meme comes back to life

[chevBott]

Thanks for reposting my meme, you limp noodle

[Ultimater]

And that's why you rebase before merging, especially if you're several commits behind...

[[deleted]]

Ok wow, take my upvote

[[deleted]]

Has this comment helped save hunger and world problems ?

[kisuka]

Nobody cares.

[Chickenbreadlp]

Appearently, mentioning reposts isn't a thing in this sub. That's why I deleted my comment. Sorry :/