docs/src/resolve-conflicts.md@e72d2b99b0f6
docs/src/resolve-conflicts.md
Sat, 10 Aug 2019 14:25:03 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sat, 10 Aug 2019 14:25:03 +0200
- changeset 614
- e72d2b99b0f6
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix xattr not synced for new files
--- 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.
