docs/src/resolve-conflicts.md@f0f24da5f920 (annotated)
docs/src/resolve-conflicts.md
Sat, 05 Aug 2017 10:57:47 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Sat, 05 Aug 2017 10:57:47 +0200
- changeset 279
- f0f24da5f920
- parent 274
- 5577d3eae04c
- child 282
- 3070d72f54af
- permissions
- -rw-r--r--
refines copy.md
|
274
5577d3eae04c
dav-sync command documentation complete
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
273
diff
changeset
|
1 | dav-sync resolve-conflicts |
|
5577d3eae04c
dav-sync command documentation complete
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
273
diff
changeset
|
2 | ========================== |
|
5577d3eae04c
dav-sync command documentation complete
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
273
diff
changeset
|
3 | |
|
5577d3eae04c
dav-sync command documentation complete
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
273
diff
changeset
|
4 | **`resolve-conflicts <directory>`** |
|
5577d3eae04c
dav-sync command documentation complete
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
273
diff
changeset
|
5 | |
|
5577d3eae04c
dav-sync command documentation complete
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
273
diff
changeset
|
6 | Removes conflict entries from the database. This does not merge any files. All files which are marked as conflict are normal files after running this command. |
|
5577d3eae04c
dav-sync command documentation complete
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
273
diff
changeset
|
7 |
