570

submitted 11 months ago by Jakylla@sh.itjust.works to c/xkcd@lemmy.world

30 comments fedilink hide all child comments

Title text: If that doesn't fix it, git.txt contains the phone number of a friend of mine who understands git. Just wait through a few minutes of 'It's really pretty simple, just think of branches as...' and eventually you'll learn the commands that will fix everything.

Transcript

[Cueball points to a computer on a desk while Ponytail and Hairy are standing further away behind an office chair.]

Cueball: This is git. It tracks collaborative work on projects through a beautiful distributed graph theory tree model.
Ponytail: Cool. How do we use it?
Cueball: No idea. Just memorize these shell commands and type them to sync up. If you get errors, save your work elsewhere, delete the project, and download a fresh copy.

top 30 comments

sorted by: hot top controversial new old

[-] IndefiniteBen@feddit.nl 71 points 11 months ago

This is helpful when you get errors: https://ohshitgit.com/

[-] Pilon23@feddit.dk 16 points 11 months ago

As someone new to using git.. Thank you!!

[-] Thorry84@feddit.nl 10 points 11 months ago

I've been using git for 10+ years and still sometimes do this. I know I could fix it, I also pretty much know what to do to fix it. However nuking the thing from orbit and restarting takes like 30 secs, so it's never worth fixing.

[-] Bilbo@hobbit.world 30 points 11 months ago

Git is something that is very comfortable to use after a year or two, but when you initially start using it, it is just so easy to mess things up in ways that are unrecoverable. I remember the silly days when I'd back up all my changes first before using git since I would so regularly lose everything through a combination of git commands.

It's easy for me now, but the initial stages punish mistakes severely. It's the dark souls of source control, except it's not really fun. It's just a very beginner unfriendly tool.

[-] Gxost@lemmy.world 23 points 11 months ago

A good GUI can solve most problems.

[-] Magnetar@feddit.de 11 points 11 months ago

If my colleagues mess something up in their fancy GUIs, they come to me to fix it in the terminal.

[-] Gxost@lemmy.world 4 points 11 months ago

My experience is the opposite. A colleague who uses SourceTree and git console (for use cases not covered by SourceTree) asked me a few times to fix his branches when something went wrong (after using git console). I easily fixed it using SmartGit (paid software).

[-] floofloof@lemmy.ca 9 points 11 months ago* (last edited 11 months ago)

Is there a really good free Git GUI for Linux? I have tried a bunch of them but all the good ones seem to be closed source and paid.

[-] aliceblossom@lemmy.world 9 points 11 months ago

I like SourceTree and it's free. I don't use it all the time, but if I've made a bunch of changes debugging something and I want to easily discard all of the debugging-only changes, the UI makes it really easy to commit or discard individual lines from the changeset.

Additionally, I set up an alias to open it from the command line (stree) and have it show whatever git directory I opened it from.

[-] floofloof@lemmy.ca 2 points 11 months ago

Will it run on Linux? I use Sourcetree on Windows but didn't think it was available for Linux.

[-] Muehe@lemmy.ml 5 points 11 months ago

Guess it's a bit subjective what would be considered good, but personally I like gitk. It's good enough for me at least.

[-] fury@lemmy.world 3 points 11 months ago

Gittyup, a fork of GitAhead, is my favorite.

[-] floofloof@lemmy.ca 1 points 11 months ago

Thanks. I'll check it out.

[-] Shardikprime@lemmy.world 19 points 11 months ago

Git --gud

[-] Brickhead92@lemmy.world 2 points 11 months ago

Wrekted 'em!

[-] freamon@endlesstalk.org 10 points 11 months ago

I literally did this yesterday.

I've since found chats with Bing are surprisingly informative.

[-] ArbitraryValue@sh.itjust.works 9 points 11 months ago

SVN gang rise up.

[-] whoisearth@lemmy.ca 9 points 11 months ago

There's dozens of us! Dozens!

[-] ChickenLadyLovesLife@lemmy.world 7 points 11 months ago

Shit, I lost the thumb drive that has my entire career's output on it.

[-] Woozy@dmv.social 2 points 11 months ago

SCCS represent!

[-] koorool@feddit.de 9 points 11 months ago

I'm using Mercurial for the last 2 years at current company, before that it was 5-7 years of Git on various jobs. It's so much better if you use it correctly (no long-living or big branches). I forgot what hell Git was sometimes.

[-] key@lemmy.keychat.org 4 points 11 months ago

I miss mercurial so much. Such a better UX.

[-] floofloof@lemmy.ca 4 points 11 months ago

I have used Mercurial at work for years, and Git for side projects. I screw up far less often in Mercurial, and its tools are easy to use. It's strange how thoroughly Git took over.

[-] shastaxc@lemmy.world 0 points 11 months ago

It's not that strange. Microsoft owns GitHub.

[-] mamotromico@lemmy.ml 3 points 11 months ago

GitHub acquisition was fairly recent compared to how long git seems to be the standard

[-] JoYo@lemmy.ml 3 points 11 months ago

I used hg until python switched to git.

if python isn't going to bother them the battle is lost.

[-] 1050053@lemmy.world 7 points 11 months ago

It's all fun and games until your colleague has to pull a PR branch... using fast-forward.

[-] kameecoding@lemmy.world 7 points 11 months ago

just rebase your fucking PR so I don't have to deal with it, thank you.

[-] luckybipedal@lemmy.world 7 points 11 months ago

IME, to use git effectively, and make sense of the man-pages, you have to know a lot of the internals of how git works. I found it helpful to read "Git from the bottom up" when I had to start using it professionally: https://jwiegley.github.io/git-from-the-bottom-up/

[-] clay_pidgin@sh.itjust.works 1 points 5 months ago

That looks helpful, thank you.

this post was submitted on 09 Aug 2023

570 points (99.0% liked)

xkcd

8106 readers

7 users here now

A community for a webcomic of romance, sarcasm, math, and language.

founded 1 year ago

MODERATORS

koraro@lemmy.world