Makefile- add-directory.md
- add-repository.md
- add-tag.md
- add-user.md
- archive.md
- check-config.md
- check-repositories.md
- checkin.md
- checkout.md
- commands.md
- configuration.md
- copy.md
- date.md
- dav-sync.1.md
- dav.1.md
- davdoc.css
- delete-conflicts.md
- edit-user.md
- edit.md
- empty-trash.md
- encryption.md
- export.md
- footer.html
- get-property.md
- get.md
- getting-started.md
- header.html
- import.md
- index.html
- info.md
- introduction.md
- list-conflicts.md
- list-directories.md
- list-repositories.md
- list-tags.md
- list-users.md
- list-versions.md
- list.md
- lock.md
- mkdir.md
- move.md
- pull.md
- push.md
- put.md
- remove-property.md
- remove-repository.md
- remove-tag.md
- remove-user.md
- remove.md
- rename.md
- repository-url.md
- resolve-conflicts.md
- restore.md
- set-property.md
- set-tags.md
- sync-check-config.md
- sync-commands.md
- sync-configuration.md
- sync-list-versions.md
- trash-info.md
- uncheckout.md
- unlock.md
- versioncontrol.md
1 ---
2 title: 'dav-sync resolve-conflicts'
3 ---
4
5 **`dav-sync resolve-conflicts <directory>`**
6
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.
9 In other words: by executing this command you assert that *you* have resolved the conflicts.
10 Usually you will not need this command.
11
12