docs/src/resolve-conflicts.md@8ca795c1ae1c
docs/src/resolve-conflicts.md
Fri, 06 Dec 2019 09:24:45 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Fri, 06 Dec 2019 09:24:45 +0100
- changeset 693
- 8ca795c1ae1c
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add -s option to dav-sync usage output
--- 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.
