Rolling back or re-creating the master branch in git?
- by Matthew Savage
I have a git repo which has a few branches - there's the master branch, which is our stable working version, and then there is a development/staging branch which we're doing new work in.
Unfortunately it would appear that without thinking I was a bit overzealous with rebasing and have pulled all of the staging code into Master over a period of time (about 80 commits... yes, I know, stupid, clumsy, poor code-man-ship etc....).
Due to this it makes it very hard for me to do minor fixes on the current version of our app (a rails application) and push out the changes without also pushing out the 'staged' new features which we don't yet want to release.
I am wondering if it is possible to do the following:
Determine the last 'trunk' commit
Take all commits from that point onward and move them into a separate branch, more or less rolling back the changes
Start using the branches like they were made for.
Unfortunately, though, I'm still continually learning about git, so I'm a bit confused about what to really do here.
Thanks!
