Fossil

Differences From Artifact [eeec42ae02]:

• File www/quickstart.wiki — part of check-in [0e1447a6ea] at 2010-12-26 00:43:43 on branch trunk — Update the quick-start guide documentation to provide hyperlinks to the command-line help in the web interface. Add the beginning of a technical overview article, but as that article is still incomplete, do not hyperlink to it. (user: drh size: 13638)

To Artifact [781bccce6f]:

• File www/quickstart.wiki — part of check-in [5fb963ab61] at 2010-12-31 21:12:42 on branch trunk — Documentation updates. (user: drh size: 13639)

201
202
203
204
205
206
207
208
209
210
211
212
213
214
215

    If you omit
    the <i>VERSION</i>, then fossil moves you to the
    latest version of the branch your are currently on.</p>

<h2>Branching And Merging</h2>

    <p>You can create branches by doing multiple commits off of the
    same base version.  To merge to branches back together, first
    [/help/update | update] to the leaf of one branch.  Then do a
    [/help/merge | merge] of the leaf of the other branch:</p>

    <blockquote>
    <b>[/help/merge | fossil merge]</b> <i>VERSION</i>
    </blockquote>

|

201
202
203
204
205
206
207
208
209
210
211
212
213
214
215

    If you omit
    the <i>VERSION</i>, then fossil moves you to the
    latest version of the branch your are currently on.</p>

<h2>Branching And Merging</h2>

    <p>You can create branches by doing multiple commits off of the
    same base version.  To merge two branches back together, first
    [/help/update | update] to the leaf of one branch.  Then do a
    [/help/merge | merge] of the leaf of the other branch:</p>

    <blockquote>
    <b>[/help/merge | fossil merge]</b> <i>VERSION</i>
    </blockquote>