TODO: Deprecate the `ConflictResolution.ALWAYS_MERGE` option

[lebrice]

Is your feature request related to a problem? Please describe. I'm thinking of deprecating this option.

Rest assured, I won't do anything backward-incompatible in the short term.

I'd like to get some feedback. Do you use this feature ?

The main reason why I'd like to deprecate (and eventually remove it) is because it makes the implementation quite a bit more complicated. I'd like to simplify / refactor the codebase, and this looks like a good candidate for being removed in the long run (only if no-one is actually using it).