docs/src/resolve-conflicts.md@839fefbdedc7
docs/src/resolve-conflicts.md
Thu, 23 May 2024 22:35:45 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Thu, 23 May 2024 22:35:45 +0200
- branch
- ucx-3.1
- changeset 816
- 839fefbdedc7
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
compatibility with UCX 3.1 plus several minor code fixes
--- 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.
