3 ms·Automatic Git conflict resolution on logs and sets1 points by relyio 9y agostephenr 9y agoIsn't the same achieved just by using `somefile*.txt merge=union` in the .gitattributes file?