Unison: conflict resolution about docker-sync HOT 6 CLOSED

unison has conflict handling implemented.

You can use the sync_args option to pass additional options to unison.

See the unison documentation for a full list of options, you may be interested by:

-copyonconflict keep copies of conflicting files
-prefer xxx choose this replica's version for conflicting changes

Unison has also the -force option, but regarding the implementation of unison dualside, I don't know how it could work...

Currently with unison unox, I use it with -prefer newer -copyonconflict.

Edit: Forgot to say that Unison, can also call external merging tools but that's surely out of your needs

from docker-sync.

i suppose conflict mode to be "host wins", not container wins. Also, when we resolve a conflict, we should growl a notifications ( no matter they are on or of for sync ) so the person is aware of.

from docker-sync.

@mickaelperrin i added this to our sprint towards unox, since it makes a lot of sense. AFAICs you already included it, right? If yes, just close this one

from docker-sync.

There is no default conflict resolution in unox strategy but the parameter sync_args is indeed here.

from docker-sync.

-prefer newer seem a good option but server time need to be the same than the host? Right now it's not.

Also should the -times be set?

from docker-sync.

Time drift is a MacOS VM issue docker/for-mac#17

from docker-sync.