Commit 8f492bc

committed

Set merge=union Git attribute for CHANGELOG.md

Currently all PRs add a line to CHANGELOG.md, usually at the end. This means they almost always run into merge conflicts since they are adding different lines at the exact same place in the file. With merge=union Git will automatically resolve these merge conflicts by keeping all lines from both sides.

1 parent a0bd3dc commit 8f492bcCopy full SHA for 8f492bc

1 file changed

+1

-0

lines changed

.gitattributes

1 file changed

+1

-0

lines changed

`‎.gitattributes‎`

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

Comments

(0)