docs/src/resolve-conflicts.md@9c2f0072abed
docs/src/resolve-conflicts.md
Sat, 25 Jul 2020 12:08:15 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sat, 25 Jul 2020 12:08:15 +0200
- changeset 724
- 9c2f0072abed
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
sort files in outgoing cmd
--- 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.
