docs/src/resolve-conflicts.md@ab09caca1be6
docs/src/resolve-conflicts.md
Mon, 08 Sep 2025 12:15:28 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Mon, 08 Sep 2025 12:15:28 +0200
- branch
- dav-2
- changeset 883
- ab09caca1be6
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
move sync main to a different file
--- 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.
