docs/src/resolve-conflicts.md@7954fdacdb5c
docs/src/resolve-conflicts.md
Tue, 12 Dec 2017 17:41:01 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Tue, 12 Dec 2017 17:41:01 +0100
- branch
- v1.1
- changeset 341
- 7954fdacdb5c
- parent 285
- 02d3e4b1245f
- child 563
- 3dffe58a573f
- permissions
- -rw-r--r--
enable va_list fix only on mingw (this is the real release, as usual)
--- 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.
