Commit e4258d5

committed

make merges on changelog easier

see https://about.gitlab.com/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/

1 parent 350aeb1 commit e4258d5Copy full SHA for e4258d5

1 file changed

+1

-0

lines changed

.gitattributes

1 file changed

+1

-0

lines changed

`‎.gitattributes`

+1

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Changes merge=union`

Comments

(0)