undefined | Better HN

0 pointsplorkyeran3y ago0 comments

Setting `CHANGELOG.md merge=union` in .gitattributes mostly eliminates spurious merges conflicts on the changelog.

0 comments

3 comments · 2 top-level

jmmv3y ago· 1 in thread

Oh wow, thanks for the tip! Had no idea this existed.

Me too! Awesome, thanks!

Doesn't make sense to automatically do this, some changes can be mutually exclusive

j / k navigate · click thread line to collapse