Created
April 30, 2013 22:22
-
-
Save motowilliams/5492400 to your computer and use it in GitHub Desktop.
Created branch from feature01 instead of master
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sitting on feature01 - all commited, no changes | |
started to work another problem | |
better create a branch for this | |
- git branch -b feature02 | |
whoops sitting on feature02 with some new changes that I really wanted based on master instead of feature01 | |
... something-something profit ... |
Or if you haven't done any work at all on feature02
, you can just git reset --hard master
to move the branch pointer (and reset the working copy) to match master
.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Assuming you're on
feature02
and you've commited (or stashed) all WIP, this will replay all commits sincefeature01
starting from `master instead:git rebase --onto master feature01