On Thursday, 26 March 2015 at 01:44:44 UTC, Brad Anderson wrote:
That's a good idea. Maybe use separate files for each changelog entry (which are then combined into into the actual changelog by the dlang.org makefile). Then there wouldn't be merge conflicts with basically every pull request.[snip]
Just noticed you mention merge=union. That's a neat feature. I'd never seen it before.