docs/src/resolve-conflicts.md@c4993f0991e4
docs/src/resolve-conflicts.md
Sun, 02 Jul 2023 10:37:44 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 02 Jul 2023 10:37:44 +0200
- changeset 766
- c4993f0991e4
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
port cmd_tagop() to ucx 3
--- 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.
