comparison: docs/src/resolve-conflicts.md
docs/src/resolve-conflicts.md
- changeset 563
- 3dffe58a573f
- parent 285
- 02d3e4b1245f
equal
deleted
inserted
replaced
| 562:78a25071ed88 | 563:3dffe58a573f |
|---|---|
| 2 title: 'dav-sync resolve-conflicts' | 2 title: 'dav-sync resolve-conflicts' |
| 3 --- | 3 --- |
| 4 | 4 |
| 5 **`dav-sync 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 Forcefully clears the conflict database. This does not merge any files. |
| 8 All files which are marked as conflict are normal files after running this command and will be uploaded at the next push. | |
| 8 In other words: by executing this command you assert that *you* have resolved the conflicts. | 9 In other words: by executing this command you assert that *you* have resolved the conflicts. |
| 10 Usually you will not need this command. | |
| 9 | 11 |
