docs/src/resolve-conflicts.md@ff9e8d2e2f3c
docs/src/resolve-conflicts.md
Thu, 30 May 2019 12:47:28 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Thu, 30 May 2019 12:47:28 +0200
- changeset 602
- ff9e8d2e2f3c
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add ucx.c to sourcefiles to fix build on some platforms
--- 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.
