You must log in or register to comment.
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!
“Proper way to commit after merge conflict” sounds like a robot trying to save a relationship after a bad sex experience
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.
git out --never-come-back
git never --gonna-give-you-up
git never --gonna-let-you-down
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!
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.See I wasn’t really going to kill myself today, but the thought of dialing that long ass number is just to much.
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 ;)
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…
Google gives you results based on your prior search history.
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.
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.
Commit branch…I see your thinking of hanging yourself, here is a link to tying a noose
man \ git
