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