added new .gitattributes file with a directive for union merging in the CHANGELOG.md
What does this MR do?
add union merge for changelog to a new .gitattributes file
How confident are you it won't break things if deployed?
this is just for our branching. So, confident.
- added a test, or explain why one is not needed/possible... (not needed here)
- no unrelated changes
- asked someone for a code review
- joined #foodsharing-beta channel at https://slackin.yunity.org
- added an entry to CHANGELOG.md (description, merge request link, username(s))