docs/src/resolve-conflicts.md@68a786fa4695
docs/src/resolve-conflicts.md
Thu, 19 Jul 2018 16:28:37 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Thu, 19 Jul 2018 16:28:37 +0200
- branch
- v1.2
- changeset 453
- 68a786fa4695
- parent 285
- 02d3e4b1245f
- child 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fixes wrong buffer allocation on windows
--- 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.
