comparison: docs/html/resolve-conflicts.html
docs/html/resolve-conflicts.html
- changeset 282
- 3070d72f54af
- parent 275
- fa48ab29abd2
- child 283
- 0e36bb75a732
equal
deleted
inserted
replaced
| 281:ddb5e8f2a43d | 282:3070d72f54af |
|---|---|
| 64 | 64 |
| 65 <!-- begin content --> | 65 <!-- begin content --> |
| 66 <div class="content"> | 66 <div class="content"> |
| 67 <h1 id="dav-sync-resolve-conflicts">dav-sync resolve-conflicts</h1> | 67 <h1 id="dav-sync-resolve-conflicts">dav-sync resolve-conflicts</h1> |
| 68 <p><strong><code>resolve-conflicts <directory></code></strong></p> | 68 <p><strong><code>resolve-conflicts <directory></code></strong></p> |
| 69 <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.</p> | 69 <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> |
| 70 </div> | 70 </div> |
| 71 <!-- end content --> | 71 <!-- end content --> |
| 72 </body> | 72 </body> |
| 73 </html> | 73 </html> |
