![]() ![]() Oh shit, I tried to run a diff but nothing happened?! # now your changes are on the correct branchĪ lot of people have suggested using cherry-pick for this situation too, so take your pick on whatever one makes the most sense to you! git checkout name-of-the-correct-branch Thank you all! Oh shit, I accidentally committed to the wrong branch! # undo the last commit, but leave the changes available Also, many many many people suggested an awesome way to make this shorter that I didn't know myself. Note: this doesn't work if you've already pushed the commit to a public/shared branch, and if you tried other things first, you might need to git reset instead of HEAD~. # your commit lives in this branch now :) # remove the last commit from the master branch Oh shit, I accidentally committed something to master that should have been on a brand new branch! # create a new branch from the current state of master Stupid commit message formatting requirements. ![]() # follow prompts to change the commit message Oh shit, I need to change the message on my last commit! git commit -amend Warning: You should never amend commits that have been pushed up to a public/shared branch! Only amend commits that only exist in your local copy or you're gonna have a bad time. You could also make the change as a new commit and then do rebase -i in order to squash them both together, but this is about a million times faster. and FML, I didn't put a space after an equals sign. This usually happens to me if I commit, then run tests/linters. # now your last commit contains that change! Mega hat tip to the many many many many many people who suggested adding it! Oh shit, I committed and immediately realized I need to make one small change! # make your change You can use this to get back stuff you accidentally deleted, or just to remove some stuff you tried that broke the repo, or to recover after a bad merge, or just to go back to a time when things actually worked. # each one has an index find the one before you broke everything # you will see a list of every thing you've Oh shit, I did something terribly wrong, please tell me git has a magic time machine!?! git reflog So here are some bad situations I've gotten myself into, and how I eventually got myself out of them in plain english. Git documentation has this chicken and egg problem where you can't search for how to get yourself out of a mess, unless you already know the name of the thing you need to know about in order to fix your problem. ![]() In this tutorial, we learned why we might need to create a new git branch from a tag for debugging and how this can be achieved with the "git checkout" command.Git is hard: screwing up is easy, and figuring out how to fix your mistakes is fucking impossible. Now we have a new branch "debug-tag-2-0" ready for debugging on local. $ git tag -lĪfter confirming that tag v2.0 fetch properly, we can now run the "git checkout" command to create the new branch from that tag. Now confirm that you have fetched the required tag v2.0 from which you want to create the branch. ![]() Make sure you fetch all the tags from your remote repository with the "git fetch" command $ git fetch -all -tags 2. Now let's go through each step one by one to create a new branch from the correct tag. Now creating a debug branch from the tag v2.0 will be the best way to make sure you have the exact code which is deployed on production. Let’s say you have deployed tag v2.0 on production and now you have some issues after the deployment. But sometimes you might want to debug the deployed code and the best way is to create a new GIT branch from that tag. GIT tags are created to mark a specific point in git history and then deployed. A new GIT branch can be created from a tag through the “git checkout” command with the “-b” option followed by a new branch name and tag name. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |