docs/src/resolve-conflicts.md@a4b4257c1a5f
docs/src/resolve-conflicts.md
Sat, 23 Nov 2019 15:14:50 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sat, 23 Nov 2019 15:14:50 +0100
- changeset 684
- a4b4257c1a5f
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
improve shell completion
--- 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.
