oooh, I can put
changelog.rst merge=union
in my .gitattributes file and will never have merge conflicts in my changelog ever again
oooh
oooh, I can put
changelog.rst merge=union
in my .gitattributes file and will never have merge conflicts in my changelog ever again
oooh
If you have a fediverse account, you can quote this note from your own instance. Search https://chaos.social/users/rixx/statuses/116092006069774540 on your instance and quote it. (Note that quoting is not supported in Mastodon.)