CPP work branch change
Hi everyone. I’m super happy to announce that we’ve gotten the C++ branch stable enough that we’re making in the default branch. This means that those of you with existing clones are going to likely do a little work to get them sane though.
Here is what was done:
- The old master branch was rename shotgun.
- The cpp branch was copy to the name master.
- The cpp branch was then deleted.
Anyone that has up to now been working on the cpp branch has a couple of options.
- Delete your clone and re-clone. This is the easiest. The default checkout will be code in the cpp branch and you’re off and going.
- Fix up your current repo. I did this by doing the following commands:
git checkout mastergit reset --hard origin/mastergit branch -D cpp
This will get your local master branch repointed and properly checked out. In addition, the old cpp local branch can be deleted.
Hopefully no one experiences much pain due to this change. It’s been a long time coming and I’m really excited.
If you do run into problems, post a comment or stop on by IRC and we’ll work it out for ya.
Thanks!
Rock on Evan! Sweet to see the new VM get merged.
Ezra
October 28, 2008 at 10:17 am
Great news! Though I think one huge merge would be better than branch renaming.
Daniel Luz
October 28, 2008 at 12:08 pm
Shouldn’t that last step be `git branch -r -D origin/cpp` ?
Jan
October 28, 2008 at 4:16 pm
Nice work dude
Very chuffed for ya
random8r
October 29, 2008 at 3:19 am