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 overwrite any changes you've made to your checkout, or it can 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 commits (by someone else) or Net pulls from a server will usually require a fossil update afterward.

Local commits are likely to be made with 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: fossil pull, fossil commit, fossil setting (autosync), checkouts, merging, Reference