• file
• latest
• revisions
• annotate
• diff
• comparison
• raw

docs/src/list-conflicts.md@aa3baf1dd81b (annotated)

docs/src/list-conflicts.md

Fri, 02 Aug 2019 21:40:05 +0200

author

Olaf Wintermann <olaf.wintermann@gmail.com>

date

Fri, 02 Aug 2019 21:40:05 +0200

changeset 610

aa3baf1dd81b

parent 563

3dffe58a573f

permissions

-rw-r--r--

fix bug in davqlexec introduced by refactoring

283 0e36bb75a732 adds dav-sync introduction and sync.xml documentation Olaf Wintermann <olaf.wintermann@gmail.com> parents: 282 diff changeset	1	---
563 3dffe58a573f adds list-conflicts command to dav-sync Mike Becker <universe@uap-core.de> parents: 285 diff changeset	2	title: 'dav-sync list-conflicts'
283 0e36bb75a732 adds dav-sync introduction and sync.xml documentation Olaf Wintermann <olaf.wintermann@gmail.com> parents: 282 diff changeset	3	---
274 5577d3eae04c dav-sync command documentation complete Olaf Wintermann <olaf.wintermann@gmail.com> parents: 273 diff changeset	4
563 3dffe58a573f adds list-conflicts command to dav-sync Mike Becker <universe@uap-core.de> parents: 285 diff changeset	5	**`dav-sync list-conflicts [-v] <directory>`**
3dffe58a573f adds list-conflicts command to dav-sync Mike Becker <universe@uap-core.de> parents: 285 diff changeset	6
3dffe58a573f adds list-conflicts command to dav-sync Mike Becker <universe@uap-core.de> parents: 285 diff changeset	7	Lists all conflicting files. If verbose output is enabled, the output also
3dffe58a573f adds list-conflicts command to dav-sync Mike Becker <universe@uap-core.de> parents: 285 diff changeset	8	shows the number of entries for the same conflicting file.
274 5577d3eae04c dav-sync command documentation complete Olaf Wintermann <olaf.wintermann@gmail.com> parents: 273 diff changeset	9
563 3dffe58a573f adds list-conflicts command to dav-sync Mike Becker <universe@uap-core.de> parents: 285 diff changeset	10	For each conflict a backup file with the pattern `orig.N.filename` has been
3dffe58a573f adds list-conflicts command to dav-sync Mike Becker <universe@uap-core.de> parents: 285 diff changeset	11	created.
3dffe58a573f adds list-conflicts command to dav-sync Mike Becker <universe@uap-core.de> parents: 285 diff changeset	12	You can resolve the conflict by either deleting the backup, or replacing the
3dffe58a573f adds list-conflicts command to dav-sync Mike Becker <universe@uap-core.de> parents: 285 diff changeset	13	conflicting file with the backup.
3dffe58a573f adds list-conflicts command to dav-sync Mike Becker <universe@uap-core.de> parents: 285 diff changeset	14	In either case you don't need to do anything more and `dav-sync` will remove
3dffe58a573f adds list-conflicts command to dav-sync Mike Becker <universe@uap-core.de> parents: 285 diff changeset	15	the conflict from the database automatically.
3dffe58a573f adds list-conflicts command to dav-sync Mike Becker <universe@uap-core.de> parents: 285 diff changeset	16	You can also use the [delete-conflicts][1] command to bulk-delete all backups
3dffe58a573f adds list-conflicts command to dav-sync Mike Becker <universe@uap-core.de> parents: 285 diff changeset	17	(in case you want to proceed with the upstream version of your files) or the
3dffe58a573f adds list-conflicts command to dav-sync Mike Becker <universe@uap-core.de> parents: 285 diff changeset	18	[resolve-conflicts][2] command to forcefully clear the conflict database.
274 5577d3eae04c dav-sync command documentation complete Olaf Wintermann <olaf.wintermann@gmail.com> parents: 273 diff changeset	19
563 3dffe58a573f adds list-conflicts command to dav-sync Mike Becker <universe@uap-core.de> parents: 285 diff changeset	20	[1]: ./delete-conflicts.html
3dffe58a573f adds list-conflicts command to dav-sync Mike Becker <universe@uap-core.de> parents: 285 diff changeset	21	[2]: ./resolve-conflicts.html