To avoid merge conflicts on a file that has many changes on the same lines, use a union merge strategy by creating .gitattributes, and putting this inside: CHANGELOG.md merge=union (this assumes the file is called CHANGELOG.md). Example. Or, try Towncrier
Git tips
CHANGELOG.md merge=union(this assumes the file is called CHANGELOG.md). Example. Or, try Towncrier