search

Leafwing-Studios / template-repo

A quick, CI-enabled Bevy template repository.
Apache License 2.0
43 stars 9 forks source link

Make RELEASES.md less conflict prone #34

Open alice-i-cecile opened 2 years ago

alice-i-cecile commented 2 years ago

What problem does this solve?

RELEASES.md is nice, but merge conflicts are common and pointless.

What solution would you like?

Setting CHANGELOG.md merge=union in .gitattributes mostly eliminates spurious merges conflicts on the changelog.