docs/src/resolve-conflicts.md@ce97ff16f00e
docs/src/resolve-conflicts.md
Sun, 28 Jan 2024 12:39:08 +0100
- author
- Mike Becker <universe@uap-core.de>
- date
- Sun, 28 Jan 2024 12:39:08 +0100
- changeset 801
- ce97ff16f00e
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add .idea directory to .hgignore
--- 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.
