Re:Git log is not a changelog
by plorkyeran on Saturday July 16, 2022 @11:11PM
(#32124145)
Setting `CHANGELOG.md merge=union` in .gitattributes mostly eliminates spurious merges conflicts on the changelog.
Oh wow, thanks for the tip! Had no idea this existed.
Re:Git log is not a changelog
by RustyRussell on Sunday July 17, 2022 @07:03AM
(#32125811)
Me too! Awesome, thanks!
Doesn't make sense to automatically do this, some changes can be mutually exclusive
This avoid merge hell on the CHANGELOG.md file.