Oh shit, git: Getting myself out of bad situations
ohshitgit.com
Oh shit, git: Getting myself out of bad situations
1–10 of 520 posts
Re: Oh shit, git: Getting myself out of bad situations
#2It happens to everyone :)
I'd like to contribute my list of git booboos: https://github.com/1337/yesterday-i-learned/blob/master/git....
Re: Oh shit, git: Getting myself out of bad situations
#3Nice. For anyone who hasn't see it, Flight Rules for Git is even more comprehensive: https://github.com/k88hudson/git-flight-rules
Re: Oh shit, git: Getting myself out of bad situations
#4If this is a guide for beginners, there should be (more?) warnings not to do history rewriting operations on commits that have already pushed.
Re: Oh shit, git: Getting myself out of bad situations
#5If this is a guide for beginners, there should be (more?) warnings not to do history rewriting operations on commits that have already pushed.
Seems they agree:
> This site is not intended to be an exhaustive reference, nor is it a beginner's tutorial.
Re: Oh shit, git: Getting myself out of bad situations
#6If this is a guide for beginners, there should be (more?) warnings not to do history rewriting operations on commits that have already pushed.
If you read to the bottom:
> Disclaimer: I am not, nor do I even remotely claim to be, an expert at git. This site is not intended to be an exhaustive reference, nor is it a beginner's tutorial. And yes, there are other ways to do these same things with more theoretical purity or whatever, but I've come to these steps through trial and error and lots of swearing and table flipping, and I had this crazy idea to share them with a healthy dose of levity and profanity. Take it or leave it as you will!
Re: Oh shit, git: Getting myself out of bad situations
#7If this is a guide for beginners, there should be (more?) warnings not to do history rewriting operations on commits that have already pushed.
From the disclaimer at the bottom:
> This site is not intended to be an exhaustive reference, nor is it a beginner's tutorial.
Re: Oh shit, git: Getting myself out of bad situations
#8[deleted]
Re: Oh shit, git: Getting myself out of bad situations
#9Is it just me or did http://ohshitgit.com/#accidental-commit-master forget to checkout master before calling reset?
Re: Oh shit, git: Getting myself out of bad situations
#10If this is a guide for beginners, there should be (more?) warnings not to do history rewriting operations on commits that have already pushed.
Why is recovering from an upstream rebase considered more problematic than recovering from merge conflicts?