docs/src/resolve-conflicts.md@2e1b59290829
docs/src/resolve-conflicts.md
Sun, 25 Aug 2019 09:43:12 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 25 Aug 2019 09:43:12 +0200
- changeset 632
- 2e1b59290829
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
rename conflict test script
--- 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.
