Note that you can specify a custom merge driver for different file types using a combination of gitattributes and git-config: https://git-scm.com/book/en/v2/Cus

Note that you can specify a custom merge driver for different file types using a combination of gitattributes and git-config: https://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes#_merge_strategies https://git-scm.com/book/en/v2/Customizing-Git-Git-Attribute...