I wonder if it would be sufficient to set the changelog's merge strategy to unio... | Hacker News

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

		slavik81 on Aug 27, 2016 \| parent \| context \| favorite \| on: Keep a Changelog I wonder if it would be sufficient to set the changelog's merge strategy to union in .gitattributes.

hadley on Aug 27, 2016 [–]

I've tried this - it helps, but it's not a silver bullet. (And GitHub doesn't use it in PRs)

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