According to this StackOverflow post [1], you'll need to write merge driver. I was looking at this when trying to hack git to use conflict-free replicated data

According to this StackOverflow post [1], you'll need to write merge driver. I was looking at this when trying to hack git to use conflict-free replicated data types (CRDTs) as a fallback for a specific document type. [1] https://stackoverflow.com/questions/23140240/git-how-do-i-add-a-custom-merge-strategy https://stackoverflow.com/questions/23140240/git-how-do-i-ad...