sunpy/sunpy — pull request #1149 by ayshih (2014-08-23 05:00:59+00:00)
Title: Use union merge strategy for the changelog

Git has the capability of specifying a different merge strategy (or driver) for different files. To avoid PRs from being blocked by merge conflicts on `CHANGELOG.md`, the file should use the "union" merge driver rather than the default "text" merge driver. See:

http://git-scm.com/docs/gitattributes
http://stackoverflow.com/questions/13263902/git-merge-keep-both

The changelog will then always have a successful merge, although the product may need to be edited afterwards if the resulting order doesn't make sense.