comparison: docs/man/dav-sync.1.man
docs/man/dav-sync.1.man
- changeset 563
- 3dffe58a573f
- parent 440
- a62d312d8e53
- child 704
- 8b88efcbf56f
equal
deleted
inserted
replaced
| 562:78a25071ed88 | 563:3dffe58a573f |
|---|---|
| 1 .\" Automatically generated by Pandoc 1.16.0.2 | 1 .\" Automatically generated by Pandoc 1.19.2.4 |
| 2 .\" | 2 .\" |
| 3 .TH "DAV\-SYNC" "1" "July 1, 2018" "Version 1.2" "DavUtils User Manuals" | 3 .TH "DAV\-SYNC" "1" "July 1, 2018" "Version 1.2" "DavUtils User Manuals" |
| 4 .hy | 4 .hy |
| 5 .SH NAME | 5 .SH NAME |
| 6 .PP | 6 .PP |
| 39 The command is similar to the push command (with the same conflict | 39 The command is similar to the push command (with the same conflict |
| 40 behavior), however it does not delete files on the server. | 40 behavior), however it does not delete files on the server. |
| 41 .RS | 41 .RS |
| 42 .RE | 42 .RE |
| 43 .TP | 43 .TP |
| 44 .B list\-conflicts [\f[B]\-v\f[]] \f[I]directory\f[] | |
| 45 Lists all conflicting files. | |
| 46 If verbose output is enabled, the output also shows the number of | |
| 47 entries for the same conflicting file. | |
| 48 .RS | |
| 49 .RE | |
| 50 .TP | |
| 44 .B resolve\-conflicts \f[I]directory\f[] | 51 .B resolve\-conflicts \f[I]directory\f[] |
| 45 Removes conflict entries from the database. | 52 Forcefully clears the conflict database. |
| 46 This does not merge any files. | 53 This does not merge any files. |
| 47 All files which are marked as conflict are normal files after running | 54 All files which are marked as conflict are normal files after running |
| 48 this command. | 55 this command. |
| 49 In other words: by executing this command you assert that \f[B]you\f[] | 56 In other words: by executing this command you assert that \f[B]you\f[] |
| 50 have resolved the conflicts. | 57 have resolved the conflicts. |
| 58 Usually you will never need this command. | |
| 51 .RS | 59 .RS |
| 52 .RE | 60 .RE |
| 53 .TP | 61 .TP |
| 54 .B delete\-conflicts \f[I]directory\f[] | 62 .B delete\-conflicts \f[I]directory\f[] |
| 55 Deletes all files that are marked as a conflict. | 63 Deletes all files that are marked as a conflict. |
