docs/src/resolve-conflicts.md@ca568c209dfd
docs/src/resolve-conflicts.md
Tue, 23 Jul 2024 14:40:20 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Tue, 23 Jul 2024 14:40:20 +0200
- changeset 825
- ca568c209dfd
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
also remove \r from user name
--- title: 'dav-sync resolve-conflicts' --- **`dav-sync resolve-conflicts <directory>`** Forcefully clears the conflict database. This does not merge any files. All files which are marked as conflict are normal files after running this command and will be uploaded at the next push. In other words: by executing this command you assert that *you* have resolved the conflicts. Usually you will not need this command.
