What do you do if you have changes out on a repository and you want them merged with your checkout?
You use the
Update merges changes from the repository into your checkout.
fossil uses a simple conflict resolution strategy for merges: the latest change wins.
Local commits are likely to be made with
set to "on", however, so if you don't use fossil for Net-wide
projects you may never have to use