docs/src/resolve-conflicts.md@5256d7eb69e7
docs/src/resolve-conflicts.md
Fri, 25 Oct 2019 19:39:33 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Fri, 25 Oct 2019 19:39:33 +0200
- changeset 671
- 5256d7eb69e7
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix test system on solaris
--- 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.
