Hacker Newsnew | past | comments | ask | show | jobs | submitlogin

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.


Me too! Awesome, thanks!


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




Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact

Search: