docs/src/resolve-conflicts.md

Wed, 05 Sep 2018 07:02:04 +0200

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Wed, 05 Sep 2018 07:02:04 +0200
branch
v1.2
changeset 463
84fbdc541752
parent 285
02d3e4b1245f
child 563
3dffe58a573f
permissions
-rw-r--r--

aes encrypter: fixes case where EVP_EncryptFinal_ex was not called at the stream end

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
5577d3eae04c dav-sync command documentation complete
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 273
diff changeset
7 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.
282
3070d72f54af more minor improvements to the documentation
Mike Becker <universe@uap-core.de>
parents: 274
diff changeset
8 In other words: by executing this command you assert that *you* have resolved the conflicts.
274
5577d3eae04c dav-sync command documentation complete
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 273
diff changeset
9

mercurial