docs/src/resolve-conflicts.md@833bbb830330
docs/src/resolve-conflicts.md
Thu, 23 May 2024 23:24:37 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Thu, 23 May 2024 23:24:37 +0200
- branch
- ucx-3.1
- changeset 819
- 833bbb830330
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
close branch ucx-3.1
--- 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.
