3 ms·
Can you explain how to do that? I must be missing something because all I could find was merge tool support but no mechanism to tell Git globally that all files
by xenadu02 7y ago
Can you explain how to do that? I must be missing something because all I could find was merge tool support but no mechanism to tell Git globally that all files with extension "xyz" should use this specific merge tool.
- bhl 7y agoAccording 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...