comparison: docs/src/resolve-conflicts.md
docs/src/resolve-conflicts.md
- changeset 282
- 3070d72f54af
- parent 274
- 5577d3eae04c
- child 283
- 0e36bb75a732
equal
deleted
inserted
replaced
| 281:ddb5e8f2a43d | 282:3070d72f54af |
|---|---|
| 2 ========================== | 2 ========================== |
| 3 | 3 |
| 4 **`resolve-conflicts <directory>`** | 4 **`resolve-conflicts <directory>`** |
| 5 | 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. | 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 In other words: by executing this command you assert that *you* have resolved the conflicts. | |
| 7 | 8 |
