docs/src/resolve-conflicts.md@4739f3ded1c0
docs/src/resolve-conflicts.md
Sat, 01 Jun 2019 10:11:40 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sat, 01 Jun 2019 10:11:40 +0200
- branch
- v1.2
- changeset 596
- 4739f3ded1c0
- parent 285
- 02d3e4b1245f
- child 563
- 3dffe58a573f
- permissions
- -rw-r--r--
update changelog for v1.2.4 release
--- 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.
