docs/src/resolve-conflicts.md@edbb20b1438d
docs/src/resolve-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 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.
