8598e188b1
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.
2 lines
25 B
Plaintext
2 lines
25 B
Plaintext
CHANGELOG.md merge=union
|