3 ms·
Setting `CHANGELOG.md merge=union` in .gitattributes mostly eliminates spurious merges conflicts on the changelog.
by plorkyeran 4y ago
Setting `CHANGELOG.md merge=union` in .gitattributes mostly eliminates spurious merges conflicts on the changelog.
- jmmv 4y agoOh wow, thanks for the tip! Had no idea this existed.
- RustyRussell 4y agoMe too! Awesome, thanks!
- cuteboy19 4y agoDoesn't make sense to automatically do this, some changes can be mutually exclusive