Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Initial doc for update. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
6d6959b47dc85cee87e2b9003ad06350 |
| User & Date: | kejoki 2008-11-17 17:11:29 |
Context
|
2008-11-19
| ||
| 16:55 | Merge src & doc leaves back. check-in: d14adf10 user: kejoki tags: trunk | |
|
2008-11-17
| ||
| 17:11 | Initial doc for update. check-in: 6d6959b4 user: kejoki tags: trunk | |
| 02:07 | reference docs -- added 'all', minor edits to others. check-in: 44b3fc6b user: kejoki tags: trunk | |
Changes
Added www/cmd_update.wiki.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > |
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 |
<h2>update</h2> What do you do if you have changes out on a repository and you want them merged with your checkout? You use the <code>update</code> command, that's what. <b>fossil</b> can <a href="about_checkout.wiki">overwrite</a> any changes you've made to your checkout, or it can <a href="about_merge.wiki">merge</a> whatever changes have occurred in the repo into your checkout. Update <em>merges</em> changes from the repository into your checkout. <b>fossil</b> uses a simple conflict resolution strategy for merges: the latest change wins. Local intranet <code><a href="cmd_commit.wiki">commit</a></code>s (by someone else) or Net <code><a href="cmd_pull.wiki">pull</a></code>s from a server will usually require a <code>fossil update</code> afterward. Local commits are likely to be made with <a href="cmd_settings.wiki#autosync">automatic syncing</a> set to "on", however, so if you don't use <b>fossil</b> for Net-wide projects you may never have to use <code>update</code>. See also: <a href="cmd_pull.wiki">fossil pull</a>, <a href="cmd_commit.wiki">fossil commit</a>, <a href="cmd_settings.wiki#autosync">fossil setting</a> (autosync), <i><a href="about_checkout.wiki">checkouts</a></i>, <i><a href="about_merge.wiki">merging</a></i>, <a href="reference.wiki">Reference</a> |