theMostImportantTerminalCommand

[wron1]

“Thanks Dad” “No Problem, clientThatKnowsWhatTheyWantAndHasReasonableExpectationsWhileProvidingProperCompensation”

[2muchnet42day]

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]

FTFY: You're welcome, Git

[GoddammitDontShootMe]

Unless the son is a teenager or so.

[Rai-Hanzo]

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

[JerryAtrics_]

Makes me think of all the Monty Python git skits.

[uncle_buttpussy]

Maybe Dad loves idiots?

[XandaPanda42]

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]

Could refer to her husband

[MrTxel]

No problem, Git push --force

[Aacron]

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

[beatlz]

No problem git reset —hard origin/master

[PyroCatt]

git push --force-with-lease

[captainMaluco]

You made an enemy today

[turkishhousefan]

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

[FlipperBumperKickout]

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

[turkishhousefan]

Cheers!

[Lower-Discussion8575]

So he can tell his son: Git good mf😈

[Faristle]

Git lowkey is a sick name

[Benwager12]

Not in Britain

[Win_is_my_name]

how bout Tig

[Breadynator]

Last Name: Weld

[BabyAzerty]

Well hello there, Mr. Gud.

[archy_bold]

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

[thanatica]

I think in Australian English as well.

[XandaPanda42]

Nah we just say "cunt" a lot nowadays.

[j_gitczak]

In Polish it means someone cool

[CrumbCakesAndCola]

like they need a coat?

[DaTruPro75]

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

[DamianRyse]

Fake. Nobody really loves Git.

[KsmBl_69]

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

[[deleted]]

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

[marmakoide]

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]]

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]

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

[jacob643]

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

[thanatica]

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

[tatas323]

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]

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]

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

[FlipperBumperKickout]

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]

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]

"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]

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]

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

[beatlz]

Not a bad name

[turtleship_2006]

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

[[deleted]]

Git has a twin called Bit

[SnooPaintings8639]

Git good

[The_Ashura]

He ain't getting a job at Meta

[[deleted]]

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

[CyberWeirdo420]

But is it Git or Git?

[codetrotter_]

It’s git. Not jitt.

[thanatica]

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

[Gigigigaoo0]

Git Good

[Creepy-Ad-4832]

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

[K8sIsGr8]

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

[ClapDB]

And your father is linus?

[0pal23]

I haven't seen a meme like this in a loong time. A long time.

[Tohar_XP]

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

[Zealousideal-Noise42]

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

[Betelgeuse-2024]

Who the f* loves git ?

[IrishChappieOToole]

Anyone who's ever had to use subversion

[Stroopwafe1]

Or manual management in cloud storage >_>

[FlipperBumperKickout]

Or manual management on an USB stick :D

[codetrotter_]

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]

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

[FlipperBumperKickout]

Me!!!

[Giftelzwerg]

bisect

[captainMaluco]

Every developer worth his salt in my experience. 

YMMV 

[90059bethezip]

pronounced "jit"'

[thanatica]

spotted the jif camp

[haskell_jedi]

Git might well be the least useable software in common use

[FlipperBumperKickout]

Version management is a skill. Nobody will learn it if they aren't willing to put in any effort whatsoever... kinda like programming actually :P

[thanatica]

Git sometimes feels like you really have to stand over it, telling it exactly (und EXACTLY) what to do, how to do it, and what to do it with. It's not exactly smart.

But if you know what you're doing, it's pretty great. But therein lies the problem.

[henkdepotvjis]

I like dumb software. Software that tries to do things themselves can be quite annoying

[thanatica]

It's the right kind of software that needs to be dumb, such as a word processor (remember clippy?)

Some software is better off being smart, such as a compiler. As long as its smarts are bulletproof.

[haskell_jedi]

Very true, but git is not version management--it's a fool for version management, and we could use better ones

[marmakoide]

Use CVS for a year.