Sat, 05 Aug 2017 13:35:27 +0200
more minor improvements to the documentation
274
5577d3eae04c
dav-sync command documentation complete
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
273
diff
changeset
|
1 | dav-sync resolve-conflicts |
5577d3eae04c
dav-sync command documentation complete
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
273
diff
changeset
|
2 | ========================== |
5577d3eae04c
dav-sync command documentation complete
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
273
diff
changeset
|
3 | |
5577d3eae04c
dav-sync command documentation complete
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
273
diff
changeset
|
4 | **`resolve-conflicts <directory>`** |
5577d3eae04c
dav-sync command documentation complete
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
273
diff
changeset
|
5 | |
5577d3eae04c
dav-sync command documentation complete
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
273
diff
changeset
|
6 | 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. |
282
3070d72f54af
more minor improvements to the documentation
Mike Becker <universe@uap-core.de>
parents:
274
diff
changeset
|
7 | In other words: by executing this command you assert that *you* have resolved the conflicts. |
274
5577d3eae04c
dav-sync command documentation complete
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
273
diff
changeset
|
8 |