So you're going to git gud?
this post was submitted on 09 Nov 2023
1274 points (98.3% liked)
Programmer Humor
32549 readers
753 users here now
Post funny things about programming here! (Or just rant about your favourite programming language.)
Rules:
- Posts must be relevant to programming, programmers, or computer science.
- No NSFW content.
- Jokes must be in good taste. No hate speech, bigotry, etc.
founded 5 years ago
MODERATORS
if u ever get a tricky merge conflict, just git push --force. this automatically works out the right code to keep (your own)
Also, a way to never have to work again!
Except if you're an employer in a very small company.
Source: my boss did this at the first company I worked at.
- git pull
- git reset --hard HEAD
- try not to cry
- cry a lot
git reflog, you can get your old commits back
But I want to pretend none of this ever happened.
git can we just pretend the last 30 minutes never happened
I feel like that would get more use than people want to admit.
lemme rebase the main branch onto my branch.
two minutes later
1 merge conflict of 57 [abort] [continue]
this is easily fixed by copy pasting the files into a new directory and never opening git again out of fear
Project managers hate this one weird trick!
One key thing that can help you wrap your head around rebasing is that branches get switched while you're doing it; so, say you're on branch feature and do git rebase master, for any merge conflict, whatever's marked "current" will be on master and what's "incoming" is from feature.
There's also git rerere that should in theory remember a resolution you do between two branches and reuse it every time after the first; I've rarely used it in practice; it would happen for long lived branches that don't get merged.
Pro tip: If your code gets flogged by git, you can always get revenge with git reflog 😉
Learning git is very easy. For example, to do it on Debain, one simply needs to run, sudo apt install lazygit
LazyGit may actually be black magic from Satan to tempt programmers into sin. And to that I say: 'where is a goat I can sacrifice to my dark lord?'
load more comments
(7 replies)
Git is a great invention but it has a few design flaws. There are too many ways to confuse it or break it, using commands that look correct, or just forgetting something. I ended up writing simple wrapper script codebase to fix it. Since then no problems.
It was conceived for experts so the new user experience is shit and the UI is not intuitive. But it has become such a widespread standard that it is very hard to completely overhaul the UI.
TBH compared to the old versioning system people used to use like SVN and Mercurial. Git is a godsend. Just taking your time in learning and not using a GUI client works wonders in learning how it works. Especially when all the GUI clients are basically a collection of commands being executed so if you fuck things up on CLI you know what happened vs using GUI.
load more comments
(1 replies)
load more comments
(3 replies)
load more comments
(1 replies)
This has been the best git tutorial I’ve come across so far. Nicely interactive and gamified. https://learngitbranching.js.org/
load more comments
(1 replies)
...not by choice, because if I don't I'll lose my job
Just rebase your life already
Great meme, and I'm sure op knows this, but for anyone else who is curious...
007 in theory means:
- 00: you have already committed your code to your local code base
- 7: When you try to merge your code with everyone else's there are 7 files that others have worked on since you last refreshed your local code base.
To resolve this, you need to go file by file and compare your changes with the changes on the remote code. You need to keep the changes others have made and incorporate your own.
You can use git diff file_name to see the differences.
If you have made small changes, it's easier to pull and force an overwrite of your local code and make changes again.
However multiple people working on the same files is usually a sign of organizational issues with management. Ie, typically you don't want multiple people working on the same files at the same time, to avoid stuff like this.
If you're not sure, ask someone that knows what they're doing before you follow any advice on Lemmy.
load more comments
(4 replies)
Lol what's git?
It's what americans from a rural area say when they want you to go away.
is what people who don't know vim and rsync have to use to mimic 1% of our power
load more comments
(1 replies)
It's the thing you use to create a local copy of the main code base, and then merge your changes back in.
OP hasn't done anything, and there's 7 conflicts between his code and main. Presumably because someone else merged their changes in the time between when OP pulled his local copy and tried to push his (non-existent) changes.
load more comments
(3 replies)
I prefer rebasing on destination branch before merging. When merging you get all the conflicts at the same time. When rebasing you can address conflicts from one commit at a time. Untangling multiple small knots is easier than one huge spaghetti. Also commit history will be much cleaner.
load more comments
(1 replies)
When we switched from svn, we had to figure out git with submodules.. that was fun
sccs, rcs, cvs... after that it's a blur of new systems every year or two
sccs
1973
rcs
1982
git
2005
How long are your years?
Maybe they're born on a leap year...
And a dog?
load more comments
(2 replies)
If you can't use git I don't see how you're gonna do with other things. It's dead simple.
Solving merge conflicts or rebasing is not simple
Do it enough times and it stops being scary.
Using a tool like VSCode to perform the actual merges on individual files also helps because it shows what "yours" and "theirs" changes are from a user perspective, not a git perspective
load more comments
(1 replies)
load more comments
(1 replies)
It's not THAT complicated but I wouldn't call it dead simple. When you understand how git works internally yeah it's pretty simple but people usually start with the idea that it's a tool to put your code on a server to synchronize with other people and only later learn that you have both a local and a remote (or multiple remote) tree and how the tree really works.
I think the problem is most git 101 tutorials teach it wrong, IMO the best git tutorial is this: https://wildlyinaccurate.com/a-hackers-guide-to-git/
Unfortunately it's pretty dense so it's gonna scare off a lot of newbies.
If it was dead simple you wouldn't need to learn 10 new concepts and google commands regularly even after using it for a couple of years. You probably forgot how you struggled at first. I have taught it multiple times and I see how beginners struggle.
load more comments
(1 replies)
I would actually say it's VERY complicated but in daily work you probably need like 5 commands and those aren't hard at all.
load more comments
(2 replies)
So many orphaned branches... Poor things.
view more: next ›