update
What do you do if you have changes out on a repository and
you want them merged with your checkout?
You use the update
command.
fossil can [./about_checkout.wiki | overwrite] any
changes you've made to your checkout, or it can
[./about_merge.wiki | merge] whatever changes have occurred
in the repo into your checkout.
Update merges changes from the repository into your checkout.
fossil uses a simple conflict resolution strategy for merges:
the latest change wins.
Local intranet [./cmd_commit.wiki | commit]
s
(by someone else)
or Net [./cmd_pull.wiki | pull]
s from a server
will usually require a fossil update
afterward.
Local commits are likely to be made with
[./cmd_settings.wiki#autosync | automatic syncing]
set to "on", however, so if you don't use fossil for Net-wide
projects you may never have to use update
.
See also: [./cmd_pull.wiki | fossil pull],
[./cmd_commit.wiki | fossil commit],
[./cmd_settings.wiki#autosync | fossil setting] (autosync),
[./about_checkout.wiki | checkouts],
[./about_merge.wiki | merging],
[./reference.wiki | Reference]