docs/src/resolve-conflicts.md@5dc7fe41e8f8
docs/src/resolve-conflicts.md
Sat, 22 Jun 2019 16:36:52 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sat, 22 Jun 2019 16:36:52 +0200
- changeset 607
- 5dc7fe41e8f8
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
move some properties to new namespace
for properties encryption we need to decide which props must be encrypted and the plan is, to decide by namespace
--- title: 'dav-sync resolve-conflicts' --- **`dav-sync resolve-conflicts <directory>`** Forcefully clears the conflict database. This does not merge any files. All files which are marked as conflict are normal files after running this command and will be uploaded at the next push. In other words: by executing this command you assert that *you* have resolved the conflicts. Usually you will not need this command.
