docs/src/resolve-conflicts.md@65e40934b26c
docs/src/resolve-conflicts.md
Sun, 08 Sep 2019 15:43:13 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 08 Sep 2019 15:43:13 +0200
- changeset 640
- 65e40934b26c
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add some copy/move tests
--- 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.
