Sun, 02 Jul 2023 12:06:45 +0200
fix split test script
283
0e36bb75a732
adds dav-sync introduction and sync.xml documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
282
diff
changeset
|
1 | --- |
0e36bb75a732
adds dav-sync introduction and sync.xml documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
282
diff
changeset
|
2 | title: 'dav-sync resolve-conflicts' |
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 | |
285
02d3e4b1245f
adds some small fixes for 1.0 release
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
283
diff
changeset
|
5 | **`dav-sync resolve-conflicts <directory>`** |
274
5577d3eae04c
dav-sync command documentation complete
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
273
diff
changeset
|
6 | |
563
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
285
diff
changeset
|
7 | Forcefully clears the conflict database. This does not merge any files. |
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
285
diff
changeset
|
8 | All files which are marked as conflict are normal files after running this command and will be uploaded at the next push. |
282
3070d72f54af
more minor improvements to the documentation
Mike Becker <universe@uap-core.de>
parents:
274
diff
changeset
|
9 | In other words: by executing this command you assert that *you* have resolved the conflicts. |
563
3dffe58a573f
adds list-conflicts command to dav-sync
Mike Becker <universe@uap-core.de>
parents:
285
diff
changeset
|
10 | Usually you will not need this command. |
274
5577d3eae04c
dav-sync command documentation complete
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
273
diff
changeset
|
11 |