docs/src/resolve-conflicts.md@4b34d12cf211
docs/src/resolve-conflicts.md
Sat, 10 Aug 2019 21:32:07 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sat, 10 Aug 2019 21:32:07 +0200
- changeset 618
- 4b34d12cf211
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
exclude tag xattr from xattribute sync
--- 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.
