docs/src/resolve-conflicts.md@ddb41a915e63
docs/src/resolve-conflicts.md
Sat, 27 Jun 2026 17:54:45 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Sat, 27 Jun 2026 17:54:45 +0200
- branch
- dav-2
- changeset 916
- ddb41a915e63
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
fix atomic.h on macos
--- 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.
