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: 
6d6959b47d 2008-11-17    kejoki: You use the <code>update</code> command, that's what.
6d6959b47d 2008-11-17    kejoki: 
6d6959b47d 2008-11-17    kejoki: <b>fossil</b> can <a href="about_checkout.wiki">overwrite</a> any
6d6959b47d 2008-11-17    kejoki: changes you've made to your checkout, or it can
6d6959b47d 2008-11-17    kejoki: <a href="about_merge.wiki">merge</a> 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: 
6d6959b47d 2008-11-17    kejoki: Local intranet <code><a href="cmd_commit.wiki">commit</a></code>s
6d6959b47d 2008-11-17    kejoki: (by someone else)
6d6959b47d 2008-11-17    kejoki: or Net <code><a href="cmd_pull.wiki">pull</a></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
6d6959b47d 2008-11-17    kejoki: <a href="cmd_settings.wiki#autosync">automatic syncing</a>
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: 
6d6959b47d 2008-11-17    kejoki: See also: <a href="cmd_pull.wiki">fossil pull</a>,
6d6959b47d 2008-11-17    kejoki: <a href="cmd_commit.wiki">fossil commit</a>,
6d6959b47d 2008-11-17    kejoki: <a href="cmd_settings.wiki#autosync">fossil setting</a> (autosync),
6d6959b47d 2008-11-17    kejoki: <i><a href="about_checkout.wiki">checkouts</a></i>,
6d6959b47d 2008-11-17    kejoki: <i><a href="about_merge.wiki">merging</a></i>,
6d6959b47d 2008-11-17    kejoki: <a href="reference.wiki">Reference</a>