https://ohshitgit.com/

Use a rebase.

lazygit ftw

I thought it was just me who has a hard time with git. I feel better now.

I like that the suicide prevention number is wrong. It should still dial, but funny.

Yep, Ive hat that one.

AI tools are actually really helpful with this kind of stuff. Not with actually resolving the conflict, but with setting things up so that you can see and reason about it.

“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 main  

i didn't see anything, officer

git out --never-come-back

It's never too late to git merge --abort!

calls suicide hotline to ask for tech support

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.

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 undo if you did something you didn't want to.

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 remember when similar screenshots circulated for how to tell if i am running jdk or jre, which is even more surprising.

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

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.

My best friend when I fuck a commit up: https://ohshitgit.com/

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.

No merges allowed. Rebase only.

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.

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.... :)