docs/src/resolve-conflicts.md@c36eddf167a8
docs/src/resolve-conflicts.md
Sun, 14 Apr 2019 20:08:18 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 14 Apr 2019 20:08:18 +0200
- changeset 574
- c36eddf167a8
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
read link on LocalResource creation
--- 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.
