3 ms·

Git supports merge drivers to do things like this: https://git-scm.com/docs/gitattributes#_defining_a_custom_merge_driver https://git-scm.com/docs/gitattributes

• barrystaes 8y ago
  This! I get that the article's solution technically does remove a merge collision problem, but this adds other non-automatable™ problems that require giving humans special instructions because of the exceptions to the rule. Use standard solutions for standard problems people. And dont do a normal merge if you dont want a normal merge. Dont fight the symptoms, look at the cause.