Changeset 2926


Ignore:
Timestamp:
Nov 16, 2006, 11:23:27 AM (16 years ago)
Author:
Jari Häkkinen
Message:

Moved merge.txt info to developer docs.

Location:
trunk/doc
Files:
1 deleted
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/doc/development/index.html

    r2924 r2926  
    469469
    470470    <li>
    471       <p> Merge the feature branch into the trunk.
    472       <ol>
     471    <p> Merge the feature branch into the trunk. To avoid confusion
     472    and minimize the risk of loosing fixes, this step is only
     473    performed by the <i>Merge Master</i>. (Johan Enell is currently
     474    <i>Merge Master</i> and as the master he knows what he is doing.)
     475    <ol>
    473476        <li> <p> Checkout a pristine version of the trunk.
    474477<pre>
Note: See TracChangeset for help on using the changeset viewer.