search

pydio / pydio-sync

Python version of the Pydio synchronization client
https://pydio.com
GNU General Public License v3.0
82 stars 32 forks source link

Add an option to always automatically solve conflicts #92

Open cdujeu opened 9 years ago

cdujeu commented 9 years ago

Conflicts currently need to be solved manually (by entering Settings and choosing the type of resolution, keep local, keep remote, keep both). We should add an option to automatically choose one resolution.

DocEmmetBrown commented 9 years ago

in the case of a conflict that still needs to be solved manually, wouldn't it be nice to have a warning (maybe an exclamation mark ?) on the pydio-sync icon in the menu bar ? I discovered today I had a conflict for a few days on one of my syncs, but I wasn't aware of it ;-) Cheers