On Fri, Sep 9, 2011 at 5:51 PM, James Cameron <[email protected]> wrote: > On Fri, Sep 09, 2011 at 08:55:05PM +0100, Daniel Drake wrote: >> We've just renamed the olpc-kernel arm-3.0 to arm-3.0-wip (Work In >> Progress). > > No worries. > > How do non-committing developers who have a clone of the repository > tracking the arm-3.0 branch adapt to this?
git fetch # will bring the new branch git checkout -b arm-3.0-wip origin/arm-3.0-wip # will create a local arm-3.0-wip, check it out # if you had local commits on your arm-3.0 branch... git merge arm-3.0 # if you had local commits on some feature branch git merge myfeature and the most important thing is git push origin arm-3.0-wip so we get your code in the next build :-) m -- [email protected] [email protected] -- Software Architect - OLPC - ask interesting questions - don't get distracted with shiny stuff - working code first - http://wiki.laptop.org/go/User:Martinlanghoff _______________________________________________ Devel mailing list [email protected] http://lists.laptop.org/listinfo/devel
