Fossil SCM
Replaced the mention of "fossil branch new" in the Quick Start doc with a link to the section of the gitusers doc which explains why this is not the recommended way of working with Fossil. Both options remain documented, but now we bring Git expats to the place where many of their _other_ questions are most likely to be answered.
Commit
f04b61f7e1a53491f86f7bdb34fa9dc13f449d11d9b4c0826e2f0ca23a07d5b7
Parent
4f42caee47ecea1…
1 file changed
+2
-6
+2
-6
| --- www/quickstart.wiki | ||
| +++ www/quickstart.wiki | ||
| @@ -410,16 +410,12 @@ | ||
| 410 | 410 | them and fails if local changes exist unless the <tt>--force</tt> |
| 411 | 411 | flag is used. |
| 412 | 412 | |
| 413 | 413 | <h2 id="branch" name="merge">Branching And Merging</h2> |
| 414 | 414 | |
| 415 | -Use the --branch option to the [/help/commit | commit] command | |
| 416 | -to start a new branch. Note that in Fossil, branches are normally | |
| 417 | -created when you commit, not before you start editing. You can | |
| 418 | -use the [/help/branch | branch new] command to create a new branch | |
| 419 | -before you start editing, if you want, but most people just wait | |
| 420 | -until they are ready to commit. | |
| 415 | +Use the --branch option to the [/help/commit | commit] command to start | |
| 416 | +a new branch at the point of need. ([./gitusers.md#bneed | Contrast git].) | |
| 421 | 417 | |
| 422 | 418 | To merge two branches back together, first |
| 423 | 419 | [/help/update | update] to the branch you want to merge into. |
| 424 | 420 | Then do a [/help/merge|merge] of the other branch that you want to incorporate |
| 425 | 421 | the changes from. For example, to merge "featureX" changes into "trunk" |
| 426 | 422 |
| --- www/quickstart.wiki | |
| +++ www/quickstart.wiki | |
| @@ -410,16 +410,12 @@ | |
| 410 | them and fails if local changes exist unless the <tt>--force</tt> |
| 411 | flag is used. |
| 412 | |
| 413 | <h2 id="branch" name="merge">Branching And Merging</h2> |
| 414 | |
| 415 | Use the --branch option to the [/help/commit | commit] command |
| 416 | to start a new branch. Note that in Fossil, branches are normally |
| 417 | created when you commit, not before you start editing. You can |
| 418 | use the [/help/branch | branch new] command to create a new branch |
| 419 | before you start editing, if you want, but most people just wait |
| 420 | until they are ready to commit. |
| 421 | |
| 422 | To merge two branches back together, first |
| 423 | [/help/update | update] to the branch you want to merge into. |
| 424 | Then do a [/help/merge|merge] of the other branch that you want to incorporate |
| 425 | the changes from. For example, to merge "featureX" changes into "trunk" |
| 426 |
| --- www/quickstart.wiki | |
| +++ www/quickstart.wiki | |
| @@ -410,16 +410,12 @@ | |
| 410 | them and fails if local changes exist unless the <tt>--force</tt> |
| 411 | flag is used. |
| 412 | |
| 413 | <h2 id="branch" name="merge">Branching And Merging</h2> |
| 414 | |
| 415 | Use the --branch option to the [/help/commit | commit] command to start |
| 416 | a new branch at the point of need. ([./gitusers.md#bneed | Contrast git].) |
| 417 | |
| 418 | To merge two branches back together, first |
| 419 | [/help/update | update] to the branch you want to merge into. |
| 420 | Then do a [/help/merge|merge] of the other branch that you want to incorporate |
| 421 | the changes from. For example, to merge "featureX" changes into "trunk" |
| 422 |