comparison: docs/html/resolve-conflicts.html
docs/html/resolve-conflicts.html
- changeset 563
- 3dffe58a573f
- parent 429
- 1607450065ba
- child 704
- 8b88efcbf56f
equal
deleted
inserted
replaced
| 562:78a25071ed88 | 563:3dffe58a573f |
|---|---|
| 51 <li><a href="sync-commands.html">Commands</a></li> | 51 <li><a href="sync-commands.html">Commands</a></li> |
| 52 <ul> | 52 <ul> |
| 53 <li><a href="pull.html">pull</a></li> | 53 <li><a href="pull.html">pull</a></li> |
| 54 <li><a href="push.html">push</a></li> | 54 <li><a href="push.html">push</a></li> |
| 55 <li><a href="archive.html">archive</a></li> | 55 <li><a href="archive.html">archive</a></li> |
| 56 <li><a href="list-conflicts.html">list-conflicts</a></li> | |
| 56 <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> | 57 <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> |
| 57 <li><a href="delete-conflicts.html">delete-conflicts</a></li> | 58 <li><a href="delete-conflicts.html">delete-conflicts</a></li> |
| 58 <li><a href="trash-info.html">trash-info</a></li> | 59 <li><a href="trash-info.html">trash-info</a></li> |
| 59 <li><a href="empty-trash.html">empty-trash</a></li> | 60 <li><a href="empty-trash.html">empty-trash</a></li> |
| 60 <li><a href="add-tag.html">add-tag</a></li> | 61 <li><a href="add-tag.html">add-tag</a></li> |
| 75 <div class="content"> | 76 <div class="content"> |
| 76 <div id="header"> | 77 <div id="header"> |
| 77 <h1 class="title">dav-sync resolve-conflicts</h1> | 78 <h1 class="title">dav-sync resolve-conflicts</h1> |
| 78 </div> | 79 </div> |
| 79 <p><strong><code>dav-sync resolve-conflicts <directory></code></strong></p> | 80 <p><strong><code>dav-sync resolve-conflicts <directory></code></strong></p> |
| 80 <p>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 <em>you</em> have resolved the conflicts.</p> | 81 <p>Forcefully clears the conflict database. This does not merge any files. All files which are marked as conflict are normal files after running this command and will be uploaded at the next push. In other words: by executing this command you assert that <em>you</em> have resolved the conflicts. Usually you will not need this command.</p> |
| 81 </div> | 82 </div> |
| 82 <!-- end content --> | 83 <!-- end content --> |
| 83 </body> | 84 </body> |
| 84 </html> | 85 </html> |
