When using the most recent GIT versions (>2.34.0), the union merge driver fails to work in Bitbucket and the PR shows merge conflicts. For particular files (like changelog), it is occasionally necessary to use merge=union in the .gitattributes file.

It would be beneficial to have this feature in Bitbucket even though the use of custom merging drivers was never supported in Bitbucket.