Add automatic merge for props changed on one side, file changed on other side

[stdedos]

UNISON 2.48.3

File change prompt is this:

changed  <-?-> props      Scripts/curl-static.sh  [] x
local        : changed file       modified on 2020-03-04 at 12:15:08  size 2298      rw-rw-r--
ubuntu       : changed props      modified on 2020-03-04 at 12:13:49  size 2236      rwxrwxr-x

I assume that the merge operation would be trivial enough: Props change remotely (content is original), content changed locally (props is original).

I am not entirely sure how this feature is supposed to work though.

[gdt]

Would be nice to know if this still happens on 2.51.2.

[stdedos]

Do you have a complied Ubuntu Xenial deb?

I could put that test into the pipeline relatively soon if there is an easily-installable/compilable version available.

[glondu]

I assume that the merge operation would be trivial enough: Props change remotely (content is original), content changed locally (props is original).

There are no merge operation built-in in Unison, and I don't think we want to start adding ones, even for what you think is trivial. By the way, no particular automatic strategy is obvious to me in your case.

[stdedos]

I am not looking for an automatic strategy resolution here.

However, I would like to be able to "Press X to merge props & content change", since you can already accurately detect what's the issue here, instead of the manual resolution (take changes, accept reconciliation, fix props, re-reconcile)