docs/src/resolve-conflicts.md@868da3f76267
docs/src/resolve-conflicts.md
Sun, 09 Dec 2018 18:32:14 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sun, 09 Dec 2018 18:32:14 +0100
- changeset 501
- 868da3f76267
- parent 285
- 02d3e4b1245f
- child 563
- 3dffe58a573f
- permissions
- -rw-r--r--
dav-sync push refactoring: create list of changes before executing sync
--- title: 'dav-sync resolve-conflicts' --- **`dav-sync resolve-conflicts <directory>`** Removes conflict entries from the database. This does not merge any files. All files which are marked as conflict are normal files after running this command. In other words: by executing this command you assert that *you* have resolved the conflicts.
