[pharmakom]

Your mention of Git reminds me of CI and makes me think of a general strategy:

1. Allow the user (of the CRDT library) to define a fitness function that should be minimised

2. When multiply valid merges are possible, pick the result according to the fitness function