comparison: docs/html/list-conflicts.html
docs/html/list-conflicts.html
- changeset 563
- 3dffe58a573f
- child 704
- 8b88efcbf56f
equal
deleted
inserted
replaced
| 562:78a25071ed88 | 563:3dffe58a573f |
|---|---|
| 1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> | |
| 2 <html xmlns="http://www.w3.org/1999/xhtml"> | |
| 3 <head> | |
| 4 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> | |
| 5 <meta http-equiv="Content-Style-Type" content="text/css" /> | |
| 6 <meta name="generator" content="pandoc" /> | |
| 7 <title>dav-sync list-conflicts</title> | |
| 8 <style type="text/css">code{white-space: pre;}</style> | |
| 9 <link rel="stylesheet" href="davdoc.css" type="text/css" /> | |
| 10 </head> | |
| 11 <body> | |
| 12 <div class="header"> | |
| 13 <a href="./index.html"><span>DavUtils documentation</span></a> | |
| 14 </div> | |
| 15 <div class="sidebar"> | |
| 16 <div class="nav"> | |
| 17 <h3>dav</h3> | |
| 18 <ul> | |
| 19 <li><a href="getting-started.html">Getting started</a></li> | |
| 20 <li><a href="commands.html">Commands</a></li> | |
| 21 <ul> | |
| 22 <li><a href="list.html">list</a></li> | |
| 23 <li><a href="get.html">get</a></li> | |
| 24 <li><a href="put.html">put</a></li> | |
| 25 <li><a href="mkdir.html">mkdir</a></li> | |
| 26 <li><a href="remove.html">remove</a></li> | |
| 27 <li><a href="copy.html">copy</a></li> | |
| 28 <li><a href="move.html">move</a></li> | |
| 29 <li><a href="export.html">export</a></li> | |
| 30 <li><a href="import.html">import</a></li> | |
| 31 <li><a href="get-property.html">get-property</a></li> | |
| 32 <li><a href="set-property.html">set-property</a></li> | |
| 33 <li><a href="remove-property.html">remove-property</a></li> | |
| 34 <li><a href="lock.html">lock</a></li> | |
| 35 <li><a href="unlock.html">unlock</a></li> | |
| 36 <li><a href="info.html">info</a></li> | |
| 37 <li><a href="date.html">date</a></li> | |
| 38 <li><a href="add-repository.html">add-repository</a></li> | |
| 39 <li><a href="remove-repository.html">remove-repository</a></li> | |
| 40 <li><a href="list-repositories.html">list-repositories</a></li> | |
| 41 <li><a href="check-config.html">check-config</a></li> | |
| 42 </ul> | |
| 43 <li><a href="configuration.html">Configuration</a></li> | |
| 44 <li><a href="encryption.html">Encryption</a></li> | |
| 45 </ul> | |
| 46 </div> | |
| 47 <div class="nav"> | |
| 48 <h3>dav-sync</h3> | |
| 49 <ul> | |
| 50 <li><a href="introduction.html">Introduction</a></li> | |
| 51 <li><a href="sync-commands.html">Commands</a></li> | |
| 52 <ul> | |
| 53 <li><a href="pull.html">pull</a></li> | |
| 54 <li><a href="push.html">push</a></li> | |
| 55 <li><a href="archive.html">archive</a></li> | |
| 56 <li><a href="list-conflicts.html">list-conflicts</a></li> | |
| 57 <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> | |
| 58 <li><a href="delete-conflicts.html">delete-conflicts</a></li> | |
| 59 <li><a href="trash-info.html">trash-info</a></li> | |
| 60 <li><a href="empty-trash.html">empty-trash</a></li> | |
| 61 <li><a href="add-tag.html">add-tag</a></li> | |
| 62 <li><a href="remove-tag.html">remove-tag</a></li> | |
| 63 <li><a href="set-tags.html">set-tags</a></li> | |
| 64 <li><a href="list-tags.html">list-tags</a></li> | |
| 65 <li><a href="add-directory.html">add-directory</a></li> | |
| 66 <li><a href="list-directories.html">list-directories</a></li> | |
| 67 <li><a href="sync-check-config.html">check-config</a></li> | |
| 68 <li><a href="check-repositories.html">check-repositories</a></li> | |
| 69 </ul> | |
| 70 <li><a href="sync-configuration.html">Configuration</a></li> | |
| 71 </ul> | |
| 72 </div> | |
| 73 </div> | |
| 74 | |
| 75 <!-- begin content --> | |
| 76 <div class="content"> | |
| 77 <div id="header"> | |
| 78 <h1 class="title">dav-sync list-conflicts</h1> | |
| 79 </div> | |
| 80 <p><strong><code>dav-sync list-conflicts [-v] <directory></code></strong></p> | |
| 81 <p>Lists all conflicting files. If verbose output is enabled, the output also shows the number of entries for the same conflicting file.</p> | |
| 82 <p>For each conflict a backup file with the pattern <code>orig.N.filename</code> has been created. You can resolve the conflict by either deleting the backup, or replacing the conflicting file with the backup. In either case you don't need to do anything more and <code>dav-sync</code> will remove the conflict from the database automatically. You can also use the <a href="./delete-conflicts.html">delete-conflicts</a> command to bulk-delete all backups (in case you want to proceed with the upstream version of your files) or the <a href="./resolve-conflicts.html">resolve-conflicts</a> command to forcefully clear the conflict database.</p> | |
| 83 </div> | |
| 84 <!-- end content --> | |
| 85 </body> | |
| 86 </html> |
