Hey all,
I have a quick question for the git experts among us. I've done some
googling, but I must not have my search query phrased exactly right, or
maybe I don't quite know the right git terminology for what I want to do.
Hopefully it's simple enough.
I have a local project here that uses git and has a single master branch.
I had a wild and crazy idea that I wanted to explore, but knew it would
involve a lot of code refactoring and rearchitecting -- I didn't want to
mess up my good working tree -- especially if the idea didn't work out. So
I created a branch:
git checkout -b newidea
I then pushed forward with the new idea inside this branch, made several
rounds of changes and many commits to this new branch. Now I really like
my new idea and I want all this work moved back into my master branch.
What's the best way do to this?
Could I rename the master branch to be "pre-newidea" or whatever I want to
call it, and then rename my "newidea" branch to "master"? Or is that bad
git practice?
Would it be better to merge all the change in my "newidea" branch back into
master? If so, how would I go about doing that?
Thanks!
Curt.
--
Curtis Olson:
http://www.atiak.com - http://aem.umn.edu/~uav/
http://www.flightgear.org - http://gallinazo.flightgear.org
------------------------------------------------------------------------------
Systems Optimization Self Assessment
Improve efficiency and utilization of IT resources. Drive out cost and
improve service delivery. Take 5 minutes to use this Systems Optimization
Self Assessment. http://www.accelacomm.com/jaw/sdnl/114/51450054/
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
