comparison: docs/src/resolve-conflicts.md
docs/src/resolve-conflicts.md
- changeset 285
- 02d3e4b1245f
- parent 283
- 0e36bb75a732
- child 563
- 3dffe58a573f
equal
deleted
inserted
replaced
| 284:8e7ef0675946 | 285:02d3e4b1245f |
|---|---|
| 1 --- | 1 --- |
| 2 title: 'dav-sync resolve-conflicts' | 2 title: 'dav-sync resolve-conflicts' |
| 3 --- | 3 --- |
| 4 | 4 |
| 5 **`resolve-conflicts <directory>`** | 5 **`dav-sync resolve-conflicts <directory>`** |
| 6 | 6 |
| 7 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. | 7 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. |
| 8 In other words: by executing this command you assert that *you* have resolved the conflicts. | 8 In other words: by executing this command you assert that *you* have resolved the conflicts. |
| 9 | 9 |
