docs/src/resolve-conflicts.md@5e6df4f502d3
docs/src/resolve-conflicts.md
Wed, 10 Apr 2019 12:54:24 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Wed, 10 Apr 2019 12:54:24 +0200
- changeset 561
- 5e6df4f502d3
- parent 285
- 02d3e4b1245f
- child 563
- 3dffe58a573f
- permissions
- -rw-r--r--
harmonizes output of push and pull
pull gets conflict counter, push uses the term conflict instead of skipped (the output also says conflict: ...)
--- 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.
