comparison: docs/src/dav-sync.1.md
docs/src/dav-sync.1.md
- changeset 563
- 3dffe58a573f
- parent 439
- e85c93b59d1c
- child 703
- 2e3a24b9896a
equal
deleted
inserted
replaced
| 562:78a25071ed88 | 563:3dffe58a573f |
|---|---|
| 31 archive [**-cld**] [**-t** *tags*] *directory* | 31 archive [**-cld**] [**-t** *tags*] *directory* |
| 32 : Uploads all new and modified files to the server. The command is similar to | 32 : Uploads all new and modified files to the server. The command is similar to |
| 33 the push command (with the same conflict behavior), however it does not | 33 the push command (with the same conflict behavior), however it does not |
| 34 delete files on the server. | 34 delete files on the server. |
| 35 | 35 |
| 36 list-conflicts [**-v**] *directory* | |
| 37 : Lists all conflicting files. If verbose output is enabled, the output also | |
| 38 shows the number of entries for the same conflicting file. | |
| 39 | |
| 36 resolve-conflicts *directory* | 40 resolve-conflicts *directory* |
| 37 : Removes conflict entries from the database. This does not merge any files. | 41 : Forcefully clears the conflict database. This does not merge any files. |
| 38 All files which are marked as conflict are normal files after running this | 42 All files which are marked as conflict are normal files after running this |
| 39 command. In other words: by executing this command you assert that **you** | 43 command. In other words: by executing this command you assert that **you** |
| 40 have resolved the conflicts. | 44 have resolved the conflicts. Usually you will never need this command. |
| 41 | 45 |
| 42 delete-conflicts *directory* | 46 delete-conflicts *directory* |
| 43 : Deletes all files that are marked as a conflict. This will always delete | 47 : Deletes all files that are marked as a conflict. This will always delete |
| 44 the files and does not move them to the trash directory. Use this command | 48 the files and does not move them to the trash directory. Use this command |
| 45 with caution. | 49 with caution. |
