docs/src/resolve-conflicts.md@f04ab0420512
docs/src/resolve-conflicts.md
Thu, 01 Feb 2018 18:25:23 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Thu, 01 Feb 2018 18:25:23 +0100
- changeset 365
- f04ab0420512
- parent 285
- 02d3e4b1245f
- child 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fixes misuse of vaarg on all platforms
The parser creates a list of all required args now. The executor then gets all arguments at once.
--- 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.
