Support of merge=union

[koppor]

When merging a branch, it often is the case that there is a conflict in the CHANGELOG only. This is not a realy confligt as the CHANGELOG entries simple have to be merged. This can be configured in git itself by using a merge=union attribute. GitHub currently doesn't support that kind of merge. It would be very helpful if github would.

Blog-Post explaining it in detail: https://about.gitlab.com/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/

Discussion at keep-a-changelog: olivierlacan/keep-a-changelog#56

[koppor]

GitHub staff on 10 Oct 2015 16:03:13 +0200:

We've added a note to this suggestion on our internal Feature Request List.

[kemitchell]

@koppor: Thanks for creating this issue and posting GitHub's response. I've sent my own note through their contact form to put my name behind the feature request, too.

The use case that brought me here is a little different: AUTHORS files, which list contributors. In terms of the bits and bytes, it's a lot like CHANGELOG, except folks append lines to the end of the file.

[kemitchell]

I received my own reply e-mail assuring that my feedback has been recorded.