docs/src/resolve-conflicts.md@f84e64afee61
docs/src/resolve-conflicts.md
Fri, 25 Jan 2019 17:01:59 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Fri, 25 Jan 2019 17:01:59 +0100
- changeset 503
- f84e64afee61
- parent 285
- 02d3e4b1245f
- child 563
- 3dffe58a573f
- permissions
- -rw-r--r--
dav-sync pull refactoring: create list of changes before 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.
