docs/src/list-conflicts.md@edbb20b1438d
docs/src/list-conflicts.md
Sun, 17 Dec 2023 14:25:34 +0100
- author
- Mike Becker <universe@uap-core.de>
- date
- Sun, 17 Dec 2023 14:25:34 +0100
- changeset 797
- edbb20b1438d
- parent 563
- 3dffe58a573f
- permissions
- -rw-r--r--
[Makefile] fix missing rules preventing dry-runs
We have to support dry-runs, because many IDEs are using
dry-runs to collect build information.
Some rules have dependencies that expect certain files or
directories to be just present. We added respective build
rules which invoke the test program. This way, the behavior
when running make normally is exactly the same, but dry-runs
are also not failing now.
--- title: 'dav-sync list-conflicts' --- **`dav-sync list-conflicts [-v] <directory>`** Lists all conflicting files. If verbose output is enabled, the output also shows the number of entries for the same conflicting file. For each conflict a backup file with the pattern `orig.N.filename` has been created. You can resolve the conflict by either deleting the backup, or replacing the conflicting file with the backup. In either case you don't need to do anything more and `dav-sync` will remove the conflict from the database automatically. You can also use the [delete-conflicts][1] command to bulk-delete all backups (in case you want to proceed with the upstream version of your files) or the [resolve-conflicts][2] command to forcefully clear the conflict database. [1]: ./delete-conflicts.html [2]: ./resolve-conflicts.html
