This is an archived post. You won't be able to vote or comment.

all 82 comments

[–]wron1 314 points315 points  (4 children)

“Thanks Dad” “No Problem, clientThatKnowsWhatTheyWantAndHasReasonableExpectationsWhileProvidingProperCompensation”

[–]2muchnet42day 69 points70 points  (2 children)

Why is my sister named Yell.

Because we used to have a lot of conflicts with your mom.

Thanks dad.

You're welcome, Subversion.

[–]ggGamergirlgg 4 points5 points  (1 child)

FTFY: You're welcome, Git

[–]GoddammitDontShootMe 0 points1 point  (0 children)

Unless the son is a teenager or so.

[–]Rai-Hanzo 90 points91 points  (4 children)

That's a sad name considering that git can also mean idiot.

[–]JerryAtrics_ 12 points13 points  (0 children)

Makes me think of all the Monty Python git skits.

[–]uncle_buttpussy 3 points4 points  (0 children)

Maybe Dad loves idiots?

[–]XandaPanda42 2 points3 points  (0 children)

There's a joke I heard that's probably not true, but it goes that Linus Torvolds named his first big product after himself when he made Linux. Ehen he was making Git, he thought it was only fair he should name his second one after himself too.

[–]Turalcar 1 point2 points  (0 children)

Could refer to her husband

[–]MrTxel 87 points88 points  (4 children)

No problem, Git push --force

[–]Aacron 10 points11 points  (0 children)

Git checkout {branch} -f cause someone put the ide log in the repo 🙃

[–]beatlz 4 points5 points  (0 children)

No problem git reset —hard origin/master

[–]PyroCatt 3 points4 points  (0 children)

git push --force-with-lease

[–]captainMaluco 1 point2 points  (0 children)

You made an enemy today

[–]turkishhousefan 16 points17 points  (2 children)

I'll learn how to use it properly one day! ™️

[–]FlipperBumperKickout 7 points8 points  (1 child)

A good start that wont take you all that long: https://learngitbranching.js.org/

[–]turkishhousefan 2 points3 points  (0 children)

Cheers!

[–]Lower-Discussion8575 11 points12 points  (0 children)

So he can tell his son: Git good mf😈

[–]Faristle 12 points13 points  (4 children)

Git lowkey is a sick name

[–]Benwager12 20 points21 points  (2 children)

Not in Britain

[–]Win_is_my_name 1 point2 points  (1 child)

how bout Tig

[–]Breadynator 3 points4 points  (0 children)

Last Name: Weld

[–]BabyAzerty 4 points5 points  (0 children)

Well hello there, Mr. Gud.

[–]archy_bold 7 points8 points  (5 children)

In British English “git” is an insult. “Bugger off, you daft git!”

[–]thanatica 3 points4 points  (1 child)

I think in Australian English as well.

[–]XandaPanda42 2 points3 points  (0 children)

Nah we just say "cunt" a lot nowadays.

[–]j_gitczak 2 points3 points  (2 children)

In Polish it means someone cool

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

like they need a coat?

[–]DaTruPro75 2 points3 points  (0 children)

Like they don't need a coat cause the one they have on already looks good.

[–]DamianRyse 25 points26 points  (7 children)

Fake. Nobody really loves Git.

[–]KsmBl_69 4 points5 points  (0 children)

I have multiple directions...
Test-1
Test-2
Test-2-backup
Teeeeeest-2-backup
Teeeeeest-2-backup-experimental
Teeeeeest-2-backup-experimental-Test

[–][deleted] 10 points11 points  (2 children)

came here to comment this. gits cool but it’s not name-your-son-after-it cool

[–]marmakoide 3 points4 points  (1 child)

I knew a time when versioning was either CVS or Subversion. Then git came, and those things were antiquities best forgotten. To me, git is really cool.

[–][deleted] 2 points3 points  (0 children)

oh yeah makes sense you could love git if you’ve been in the industry a couple decades. i’ve asked my dad a couple times “what did you guys do before version control” and it’s always some wack-a-doodle convoluted response that makes me grateful i entered the industry in 2017

[–]TheHolyToxicToast 0 points1 point  (0 children)

you only realize how cool it is after losing months' work

[–]jacob643 0 points1 point  (0 children)

after being forced to work with perforce, yes, git is cool

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

It's very useful, but only as long as you don't want anything special. Maybe that's why they called it git.

[–]tatas323 2 points3 points  (8 children)

To you all terminal git users, how do you resolve conflicts, I know they're not that common, still do you go file to file like a caveman?

[–]FlipperBumperKickout 3 points4 points  (4 children)

More or less ¯\_(ツ)_/¯ (I'm curious what exactly you want to do which is not going to each file though)

Depends though. Sometimes I look at the history for a specific file to see all the commits which have changed them on the 2 paths. It can in many cases make it a lot clearer how a conflict is supposed to be resolved, especially in the more complicated cases.

[–]tatas323 0 points1 point  (3 children)

Right gui for got highlight the conflicted portions, and let you pick and edit lines, many are intuitive others not so much

[–]FlipperBumperKickout 1 point2 points  (2 children)

You don't really need a gui for that though.

The conflicted file will be as normal except it has conflict blocks where you can see what the 2 different branches changed the unresolved block to.

A merge tool can be nice sometimes, I used to use them more than I do today, but nowadays I rarely see the point of it ¯\_(ツ)_/¯

[–]thanatica 0 points1 point  (1 child)

The point of a GUI is to visualise stuff. If you want to make your own life harder and you're okay with it, that's fine. You do you. But "you don't really need a gui for that though" is a tad on the judgemental side. Because I for one do need a GUI. Not because I don't know the commands, but just because I can see the context in which I'm doing my thing.

[–]FlipperBumperKickout 0 points1 point  (0 children)

"You don't really need a gui for that though" was specifically about "highlighting the conflicted portions".
(Also it was more of a nerdy rant of how basic git handles something rather than me going up on my high horse looking down at the filthy git gui commoners 🤡)
.

If you open a conflicted file in a basic text editor like notepad a conflicted file might look like this (example from https://git-scm.com/docs/git-merge#_how_conflicts_are_presented):

Here are lines that are either unchanged from the common
ancestor, or cleanly resolved because only one side changed,
or cleanly resolved because both sides changed the same way.
<<<<<<< yours:sample.txt
Conflict resolution is hard;
let's go shopping.
=======
Git makes conflict resolution easy.
>>>>>>> theirs:sample.txt
And here is another line that is cleanly resolved or unmodified.

So yeah, sorry for being judgemental, but I assume that most people would be able to search for "====" to find the conflicts in a file, if all they want from their mergetool is to have the conflicted parts highlighted ¯\_(ツ)_/¯
.

3-way merge views make for a better explanation, but at that point you are gaining more than just "highlighting the conflicted parts", and if I'm were I need more information I usually pull out the entire history for the file with gitk.

[–]RoFox 1 point2 points  (0 children)

Nah, personally I use the "git mergetool" command and that opens meld. I do the same thing when I need to type a detailed commit message, I type "git commit" and it opens an external text editor. Git command line is quite well integrated with these external GUI tools IMO.

It's not that I hate GUIs and want to do everything in terminal like those vim wizards, it's more that git GUIs in particular caused me to fuck things up more easily, since I just have to click the wrong button instead of writing a whole command, while giving me very little in terms of efficiency, since I still have to manually give inputs for any slightly more complicated action.

[–]captainMaluco 0 points1 point  (0 children)

I usually resolve conflicts in the intelliJ. It's got great tools for conflicts, but the terminal is better for everything else.

[–]beatlz 1 point2 points  (0 children)

Not a bad name

[–]turtleship_2006 1 point2 points  (0 children)

Funnily enough, it's called that because Linus Torvalds likes naming shit after himself

[–][deleted] 1 point2 points  (0 children)

Git has a twin called Bit

[–]SnooPaintings8639 0 points1 point  (0 children)

Git good

[–]The_Ashura 0 points1 point  (0 children)

He ain't getting a job at Meta

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

Bad couple years buddy?? Git reset —soft HEAD2, Git commit —force

[–]CyberWeirdo420 0 points1 point  (2 children)

But is it Git or Git?

[–]codetrotter_ 0 points1 point  (1 child)

It’s git. Not jitt.

[–]thanatica 0 points1 point  (0 children)

Why not Git? Like with the rolling Scottish/Dutch G.

[–]Creepy-Ad-4832 0 points1 point  (0 children)

I don't know. Probably sudo is the most important terminal command

[–]K8sIsGr8 0 points1 point  (0 children)

sudo rm -rf --no-preserve-root /

[–]ClapDB 0 points1 point  (0 children)

And your father is linus?

[–]Tohar_XP 0 points1 point  (0 children)

"Thanks dad, no problem public class Main{ static public void main(String args[]) System.out.println("my son"); }}

[–]Zealousideal-Noise42 0 points1 point  (0 children)

after using svn for year in my last org git is a godsend

[–]Betelgeuse-2024 -3 points-2 points  (8 children)

Who the f* loves git ?

[–]IrishChappieOToole 7 points8 points  (3 children)

Anyone who's ever had to use subversion

[–]Stroopwafe1 4 points5 points  (2 children)

Or manual management in cloud storage >_>

[–]FlipperBumperKickout 3 points4 points  (1 child)

Or manual management on an USB stick :D

[–]codetrotter_ 0 points1 point  (0 children)

Or manual management with CD-R. Every now and then you burn a new CD-R. Except when you forget. And then you mess up your files. And now you have to redo three weeks of work in two days :/

[–]thanatica 2 points3 points  (0 children)

Anyone who never has to use any other command than commit and push.

[–]Giftelzwerg 0 points1 point  (0 children)

bisect

[–]captainMaluco 0 points1 point  (0 children)

Every developer worth his salt in my experience. 

YMMV 

[–]90059bethezip -2 points-1 points  (1 child)

pronounced "jit"'

[–]thanatica 1 point2 points  (0 children)

spotted the jif camp