docs/src/pull.md@4322b8953bd5
docs/src/pull.md
Sun, 04 Feb 2018 11:14:20 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 04 Feb 2018 11:14:20 +0100
- changeset 369
- 4322b8953bd5
- parent 285
- 02d3e4b1245f
- child 409
- 90a6d6952d83
- permissions
- -rw-r--r--
adds tag conflict detection for dav-sync push
--- title: 'dav-sync pull' --- **`dav-sync pull [-cld] <directory>`** Pulls all changes from the server. All new or modified files are downloaded and all files deleted on the server are deleted locally. If a file is also locally modified and conflict detection is not disabled, the local file is renamed and an entry in the conflict database is added. When a trash directory is configured for the SyncDirectory, all files that would be deleted are instead moved to the trash directory. When backup-on-pull is enabled for the SyncDirectory, all files that would be overwritten are also moved to the trash. **`-c`** Disable conflict detection. This always overwrites locally modified files **`-l`** Lock the repository before accessing it. After `pull` completed, the repository is unlocked **`-d`** Don't lock the repository (default)
