.gitattributes

6 years ago

Update merge strategy for CHANGELOG.md · 251d8421

Richard Clamp authored 6 years ago

https://git-scm.com/docs/gitattributes#_performing_a_three_way_merge

In fee58e65 the file was renamed from
CHANGELOG -> CHANGELOG.md and later converted to markdown.

Here we update the .gitattributes to reflect the rename, as merge=union
will probably reduce some of the rebase conflicts in CHANGELOG.md

251d8421

History

Update merge strategy for CHANGELOG.md

Richard Clamp authored 6 years ago

https://git-scm.com/docs/gitattributes#_performing_a_three_way_merge

In fee58e65 the file was renamed from
CHANGELOG -> CHANGELOG.md and later converted to markdown.

Here we update the .gitattributes to reflect the rename, as merge=union
will probably reduce some of the rebase conflicts in CHANGELOG.md

Code owners

Assign users and groups as approvers for specific file changes. Learn more.