comparison: docs/src/resolve-conflicts.md
docs/src/resolve-conflicts.md
- changeset 274
- 5577d3eae04c
- parent 273
- c743721d566f
- child 282
- 3070d72f54af
equal
deleted
inserted
replaced
| 273:c743721d566f | 274:5577d3eae04c |
|---|---|
| 1 dav-sync resolve-conflicts | |
| 2 ========================== | |
| 3 | |
| 4 **`resolve-conflicts <directory>`** | |
| 5 | |
| 6 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 |
