Jesse Braham 8598e188b1 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.

2023-07-12 09:24:09 -07:00

25 B

Raw Blame History

View Raw