Changes between Version 52 and Version 53 of Be a CIVL developer


Ignore:
Timestamp:
02/24/17 13:37:04 (9 years ago)
Author:
siegel
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • Be a CIVL developer

    v52 v53  
    6464svn merge ^/trunk  .
    6565}}}
     66Resolve any conflicts and when you are satisfied with the state of your local copy, commit it as usual.
    6667Do this regularly (or whenever changes are committed to the trunk) in order to reduce the work of resolving conflicts when you decide to merge your branch back to the trunk.
    67 * Lead developers only: to merge a branch back to the trunk, change into the local branch directory and type
    68 {{{
    69 svn merge . ^/trunk
    70 }}}
    71 Resolve conflicts as needed and make sure all tests pass.
    72 * Checkout the merge history from trunk to your branch, go to your branch:
     68* To see a summary of the merge history from the trunk to your branch, go into your branch directory and type
    7369{{{
    7470svn mergeinfo ^/trunk
    7571}}}
     72* Lead developers only: to merge a branch back to the trunk, change into your local copy of the trunk directory and type
     73{{{
     74svn merge ^/branches/branch_name .
     75}}}
     76Resolve conflicts as needed and make sure all tests pass.  Then commit the trunk.  At this point the branch may be deleted (`svn remove ^/branches/branch_name`) or it can be kept around if the developer wants to continue to use it.
     77