docs/src/resolve-conflicts.md@41b4cc024249
docs/src/resolve-conflicts.md
Sat, 09 Nov 2019 10:18:58 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sat, 09 Nov 2019 10:18:58 +0100
- changeset 678
- 41b4cc024249
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
add tests for tag conflict resolution
--- 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.
