docs/src/resolve-conflicts.md@15006651a5d1
docs/src/resolve-conflicts.md
Sun, 16 Jul 2023 13:52:02 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 16 Jul 2023 13:52:02 +0200
- changeset 777
- 15006651a5d1
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix dav_add_collection_lock() setting the lock path
--- 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.
