Sun, 16 Apr 2023 14:12:24 +0200
fix build system
704
8b88efcbf56f
update html doc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
1 | <!DOCTYPE html> |
8b88efcbf56f
update html doc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
2 | <html xmlns="http://www.w3.org/1999/xhtml" lang="" xml:lang=""> |
273 | 3 | <head> |
704
8b88efcbf56f
update html doc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
4 | <meta charset="utf-8" /> |
273 | 5 | <meta name="generator" content="pandoc" /> |
704
8b88efcbf56f
update html doc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
6 | <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> |
283
0e36bb75a732
adds dav-sync introduction and sync.xml documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
282
diff
changeset
|
7 | <title>dav-sync resolve-conflicts</title> |
704
8b88efcbf56f
update html doc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
8 | <style type="text/css"> |
8b88efcbf56f
update html doc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
9 | code{white-space: pre-wrap;} |
8b88efcbf56f
update html doc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
10 | span.smallcaps{font-variant: small-caps;} |
8b88efcbf56f
update html doc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
11 | span.underline{text-decoration: underline;} |
8b88efcbf56f
update html doc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
12 | div.column{display: inline-block; vertical-align: top; width: 50%;} |
8b88efcbf56f
update html doc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
13 | </style> |
8b88efcbf56f
update html doc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
14 | <link rel="stylesheet" href="davdoc.css" /> |
8b88efcbf56f
update html doc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
15 | <!--[if lt IE 9]> |
8b88efcbf56f
update html doc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
16 | <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script> |
8b88efcbf56f
update html doc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
17 | <![endif]--> |
273 | 18 | </head> |
19 | <body> | |
20 | <div class="header"> | |
285
02d3e4b1245f
adds some small fixes for 1.0 release
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
283
diff
changeset
|
21 | <a href="./index.html"><span>DavUtils documentation</span></a> |
273 | 22 | </div> |
23 | <div class="sidebar"> | |
24 | <div class="nav"> | |
25 | <h3>dav</h3> | |
26 | <ul> | |
27 | <li><a href="getting-started.html">Getting started</a></li> | |
28 | <li><a href="commands.html">Commands</a></li> | |
29 | <ul> | |
30 | <li><a href="list.html">list</a></li> | |
31 | <li><a href="get.html">get</a></li> | |
32 | <li><a href="put.html">put</a></li> | |
33 | <li><a href="mkdir.html">mkdir</a></li> | |
34 | <li><a href="remove.html">remove</a></li> | |
35 | <li><a href="copy.html">copy</a></li> | |
36 | <li><a href="move.html">move</a></li> | |
704
8b88efcbf56f
update html doc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
37 | <li><a href="rename.html">rename</a></li> |
429
1607450065ba
this could be the 1.2 release
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
320
diff
changeset
|
38 | <li><a href="export.html">export</a></li> |
1607450065ba
this could be the 1.2 release
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
320
diff
changeset
|
39 | <li><a href="import.html">import</a></li> |
273 | 40 | <li><a href="get-property.html">get-property</a></li> |
41 | <li><a href="set-property.html">set-property</a></li> | |
320
12ed560c926c
adds documentation for new features
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
285
diff
changeset
|
42 | <li><a href="remove-property.html">remove-property</a></li> |
273 | 43 | <li><a href="lock.html">lock</a></li> |
44 | <li><a href="unlock.html">unlock</a></li> | |
45 | <li><a href="info.html">info</a></li> | |
46 | <li><a href="date.html">date</a></li> | |
704
8b88efcbf56f
update html doc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
47 | <li><a href="versioncontrol.html">versioncontrol</a></li> |
8b88efcbf56f
update html doc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
48 | <li><a href="list-versions.html">list-versions</a></li> |
8b88efcbf56f
update html doc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
49 | <li><a href="checkout.html">checkout</a></li> |
8b88efcbf56f
update html doc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
50 | <li><a href="checkin.html">checkin</a></li> |
8b88efcbf56f
update html doc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
51 | <li><a href="uncheckout.html">uncheckout</a></li> |
273 | 52 | <li><a href="add-repository.html">add-repository</a></li> |
429
1607450065ba
this could be the 1.2 release
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
320
diff
changeset
|
53 | <li><a href="remove-repository.html">remove-repository</a></li> |
273 | 54 | <li><a href="list-repositories.html">list-repositories</a></li> |
704
8b88efcbf56f
update html doc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
55 | <li><a href="repository-url.html">repository-url</a></li> |
8b88efcbf56f
update html doc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
56 | <li><a href="add-user.html">add-user</a></li> |
8b88efcbf56f
update html doc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
57 | <li><a href="remove-user.html">remove-user</a></li> |
8b88efcbf56f
update html doc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
58 | <li><a href="edit-user.html">edit-user</a></li> |
8b88efcbf56f
update html doc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
59 | <li><a href="list-users.html">list-users</a></li> |
273 | 60 | <li><a href="check-config.html">check-config</a></li> |
61 | </ul> | |
62 | <li><a href="configuration.html">Configuration</a></li> | |
63 | <li><a href="encryption.html">Encryption</a></li> | |
64 | </ul> | |
65 | </div> | |
66 | <div class="nav"> | |
67 | <h3>dav-sync</h3> | |
68 | <ul> | |
69 | <li><a href="introduction.html">Introduction</a></li> | |
70 | <li><a href="sync-commands.html">Commands</a></li> | |
71 | <ul> | |
72 | <li><a href="pull.html">pull</a></li> | |
73 | <li><a href="push.html">push</a></li> | |
320
12ed560c926c
adds documentation for new features
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
285
diff
changeset
|
74 | <li><a href="archive.html">archive</a></li> |
704
8b88efcbf56f
update html doc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
75 | <li><a href="restore.html">restore</a></li> |
8b88efcbf56f
update html doc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
76 | <li><a href="list-conflicts.html">list-conflicts</a></li> |
273 | 77 | <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> |
78 | <li><a href="delete-conflicts.html">delete-conflicts</a></li> | |
79 | <li><a href="trash-info.html">trash-info</a></li> | |
80 | <li><a href="empty-trash.html">empty-trash</a></li> | |
704
8b88efcbf56f
update html doc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
81 | <li><a href="list-versions.html">list-versions</a></li> |
429
1607450065ba
this could be the 1.2 release
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
320
diff
changeset
|
82 | <li><a href="add-tag.html">add-tag</a></li> |
1607450065ba
this could be the 1.2 release
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
320
diff
changeset
|
83 | <li><a href="remove-tag.html">remove-tag</a></li> |
1607450065ba
this could be the 1.2 release
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
320
diff
changeset
|
84 | <li><a href="set-tags.html">set-tags</a></li> |
1607450065ba
this could be the 1.2 release
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
320
diff
changeset
|
85 | <li><a href="list-tags.html">list-tags</a></li> |
273 | 86 | <li><a href="add-directory.html">add-directory</a></li> |
87 | <li><a href="list-directories.html">list-directories</a></li> | |
88 | <li><a href="sync-check-config.html">check-config</a></li> | |
89 | <li><a href="check-repositories.html">check-repositories</a></li> | |
90 | </ul> | |
91 | <li><a href="sync-configuration.html">Configuration</a></li> | |
92 | </ul> | |
93 | </div> | |
94 | </div> | |
95 | ||
96 | <!-- begin content --> | |
97 | <div class="content"> | |
704
8b88efcbf56f
update html doc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
98 | <header> |
283
0e36bb75a732
adds dav-sync introduction and sync.xml documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
282
diff
changeset
|
99 | <h1 class="title">dav-sync resolve-conflicts</h1> |
704
8b88efcbf56f
update html doc
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
563
diff
changeset
|
100 | </header> |
285
02d3e4b1245f
adds some small fixes for 1.0 release
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
283
diff
changeset
|
101 | <p><strong><code>dav-sync resolve-conflicts <directory></code></strong></p> |
563
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
429
diff
changeset
|
102 | <p>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 <em>you</em> have resolved the conflicts. Usually you will not need this command.</p> |
273 | 103 | </div> |
104 | <!-- end content --> | |
105 | </body> | |
106 | </html> |