Suggestion for the FAQ:

[ErikDeBruijn]

I'm suggesting this addition to the FAQ:

Question: How to prevent merge conflicts when Pull Requests each have changed the CHANGELOG.md file?

Simply set the merge strategy to union by adding a .gitattributes file with this command:
echo CHANGELOG.md merge=union >> .gitattributes

The union merge strategy is most appropriate for files where merge conflicts are often trivial and can be auto-resolved by simply taking all changes. It's less suitable for files where the order of lines or the exact content is crucial, as it could result in incorrect or duplicate entries.