docs/src/resolve-conflicts.md@aa49966e4e85
docs/src/resolve-conflicts.md
Sun, 16 Jun 2019 13:14:24 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 16 Jun 2019 13:14:24 +0200
- changeset 606
- aa49966e4e85
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add new session flags for properties encryption
--- 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.
