docs/src/resolve-conflicts.md@c7bedb422d63
docs/src/resolve-conflicts.md
Sat, 01 Jun 2019 10:55:32 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sat, 01 Jun 2019 10:55:32 +0200
- changeset 604
- c7bedb422d63
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
Added tag v1.2.4 for changeset dcf751b270dd
--- 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.
