Ideas to prevent merge conflicting from CHANGELOG.md
Current behavier
- Introduced in .gitattributes (28.07.2017): CHANGELOG.md merge=union
- We have a lot of duplicate entries after rebasing.
Possible solution
Extra markdown file for each line
These solutions have in common that they use an extra markdown file for each line in the changelog.
Edited by Christian Walgenbach