Commit 8598e18

committed

Set merge=union git attribute for CHANGELOG.md

Currently all PRs add a line to CHANGELOG.md; 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 58651f0 commit 8598e18Copy full SHA for 8598e18

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)