When you screw up git
When you screw up git
Comments
66-
-
It's never too late to
git merge --abort!-
But abortion is murder?!?!?!?!?
-
🎶 every branch is sacred 🎶
-
-
-
“Proper way to commit after merge conflict” sounds like a robot trying to save a relationship after a bad sex experience
-
git reset --hard <commit-hash> git push -f origin maini didn't see anything, officer
-
git out --never-come-back
-
git never --gonna-give-you-up
-
git never --gonna-let-you-down
-
-
-
calls suicide hotline to ask for tech support
-
Don't hold your breath, they're pretty mid at their actual job.
-
-
Jujutsu (which is compatible with git) has a nice conflict resolution flow that doesn't break you workflow.
Conflicts are encoded into the commits, so that there is never a weird in between state that you have to deal with immediately before being able to do anything else.
Then you can use Jujutsu's easier history manipulation to resolve the conflict in the conflicted commits.https://steveklabnik.github.io/jujutsu-tutorial/branching-merging-and-conflicts/conflicts.html
And you could always
jj undoif you did something you didn't want to. -
Keep your commits small. Merge often. That will reduce the likelihood of terrible merge conflicts.
If you’re not sharing your work with your team mates for a long time, then you’re setting yourself up for trouble.
-
Also rebase is usually better than merge.
-
-
Been there too OP. Not a good place.
It's usually easier to find another job, it will reset your mind, and fear won't be driving you.
Or you could just commit what you have, comment "YOLO" and auto resolve conflicts and push.
-
I prefer to just delete the whole .git and start a new repository with the new version. We are pivoting the project, new name and new repo
-
-
I remember when similar screenshots circulated for how to tell if i am running jdk or jre, which is even more surprising.
-
No merges allowed. Rebase only.
-
And if you can't figure out how to rebase, I definitely don't want you solving your own merge commit!
-
-
See I wasn't really going to kill myself today, but the thought of dialing that long ass number is just to much.
-
in life you commit to many things. you commit to yourself, to your partner, to happiness, to legacy.
when we die, is that like a push to origin?
when we die, do our commits all go to the big repo in the sky?
is god the maintainer? when you pray is that like a bug report?
so many questions...
-
Little branch, as our master says: We all have our feature to accomplish. Once our feature is complete, our faith will be up to the maintainer. If you were a well behaved branch, you will be allowed to merge with the master. If you weren't so, you'll be deleted and burn In the flames of reflog.
-
-
My best friend when I fuck a commit up: https://ohshitgit.com/
-
I didn't know about the "revert single file" trick either. The rest is a handy reference too, thanks for sharing!
-
-
Google gives you results based on your prior search history.
-
git is like a minefield. stray away even a little bit from standard path and you are done for. I had git multiple times throw some obscure errors at me when trying some commands and then trying to undo/recover. how's "undo" is not a git command I don't understand.
-
undo is a jj command ;)
-
-
If you git help, you could hash things out, rebase your commitments, and push forward to a better life. Then again I could just be cherry picking things.
-
Commit branch...I see your thinking of hanging yourself, here is a link to tying a noose
-
I don't get why people have such problems with this they even make memes about it.
Have you people never merged anything by hand or what? It's really not hard.
-
it's fine for simple merge conflicts but it quickly gets messy when the two branches are trying to do opposite things to the same code
-
Or 3 branches..
-
Sounds like agreement and resolution are required pre merge conflict resolve.
-
-
it's maybe more annoying in gamedev. textures, models are binary files that can't be changed line-by-line.
-
In game dev, a binary file conflict means someone is going to have to do their work a second time.
-
-
-
man \
git -
So cool, I havent seen an ad like this in at least a decade. I use something called an ad blocker and also I switched to Kagi, so.... :)
Holy fuck, that's a long phone number
It is a duplicated repeating error because this clownshow of a website is managed by squirrels and ducks. 1-800-273-8255 would be a valid US number. Doubling 273-8255 is not, but probably vibe coded under management that should be purged by these results.
Hey! Don't insult ducks like that! This clownshow website would be about 20% better if ducks were involved.
Why not 1800-SUICIDE?
Well, that’s easy to remember! 0118, 999, 881, 999, 119, 725...3.
Did you see that ludicrious display last night??
The irony is, I remember it perfectly.
It's easier to remember if you sing it.
A B C D E F G, I hang a noose on this tree. 𝅘𝅥𝅮𝆕
But for real: You should reset hard the head of the git branch, not yours.