3 ms·
This solution is neat, but Git also has a very simple built in solution: https://git-scm.com/docs/gitattributes#gitattributes-union https://git-scm.com/docs/git
by lozenge 8y ago
This solution is neat, but Git also has a very simple built in solution: https://git-scm.com/docs/gitattributes#gitattributes-union https://git-scm.com/docs/gitattributes#gitattributes-union
- nettsundere 8y agounion is bad in general, there is a risk of bad merge
- nettsundere 8y agoworks pretty well until you really need to have similar lines from each branch