Changes between Version 20 and Version 21 of TryModBoost


Ignore:
Timestamp:
Dec 2, 2013, 7:21:09 PM (5 years ago)
Author:
Beman Dawes
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • TryModBoost

    v20 v21  
    8888=== Checking out a particular branch ===
    8989
    90 The {{{clone}}} operation above leaves the individual libraries in the {{{modular-boost}}} local repository in a detached state that is not very useful and can result in data loss. So the first thing you want to do is switch a library you want to modify to the branch you want to work on. For example, if you want to do some maintenance on the {{{develop}}} branch of my-lib, do this:
     90The {{{clone}}} operation above leaves the individual libraries in the {{{modular-boost}}} local repository in a detached state that is not very useful and can result in data loss. So the first thing you want to do is switch a library you want to modify to the branch you want to work on. For example, if you want to do some maintenance on the {{{develop}}} branch of {{{my-lib}}}, do this:
    9191
    9292{{{
    93 cd libs/my-lib
    94 git checkout develop
     93cd modular-boost/libs/my-lib
     94git checkout -B develop remotes/origin/develop
    9595}}}
    9696
    97 {{{develop}}} corresponds to svn {{{trunk}}}, and is the starting point for simple changes that do not justify creating a new branch.
     97Be sure to use {{{git checkout}}} as shown. If you just did {{{git checkout develop}}} you would get a local branch that did not track the remote.
     98
     99You are now ready to start regular maintenance!
    98100