408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
|
Is similar to update except that it does not honor the autosync
setting, nor does it merge in local changes - it prefers to overwrite
them and fails if local changes exist unless the <tt>--force</tt>
flag is used.
<h2 id="branch" name="merge">Branching And Merging</h2>
Use the --branch option to the [/help/commit | commit] command
to start a new branch. Note that in Fossil, branches are normally
created when you commit, not before you start editing. You can
use the [/help/branch | branch new] command to create a new branch
before you start editing, if you want, but most people just wait
until they are ready to commit.
To merge two branches back together, first
[/help/update | update] to the branch you want to merge into.
Then do a [/help/merge|merge] of the other branch that you want to incorporate
the changes from. For example, to merge "featureX" changes into "trunk"
do this:
|
|
|
<
<
<
<
|
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
|
Is similar to update except that it does not honor the autosync
setting, nor does it merge in local changes - it prefers to overwrite
them and fails if local changes exist unless the <tt>--force</tt>
flag is used.
<h2 id="branch" name="merge">Branching And Merging</h2>
Use the --branch option to the [/help/commit | commit] command to start
a new branch at the point of need. ([./gitusers.md#bneed | Contrast git].)
To merge two branches back together, first
[/help/update | update] to the branch you want to merge into.
Then do a [/help/merge|merge] of the other branch that you want to incorporate
the changes from. For example, to merge "featureX" changes into "trunk"
do this:
|