Update merge strategy for CHANGELOG.md · 251d8421d5 - gitlab/omnibus-gitlab - Bravo's Git Server

Update merge strategy for CHANGELOG.md

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

In fee58e6556 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

This commit is contained in:

Richard Clamp

2018-03-26 11:24:12 +01:00

parent 3fa74479e6

commit 251d8421d5

1 changed files with 1 additions and 1 deletions

2

.gitattributes vendored

View File

 @ -1,2 +1,2 @@
 CHANGELOG merge=union
 CHANGELOG.md merge=union
 *.rb.template gitlab-language=ruby