New attempt with union merge...

[oscargus]

Based on discussions in #1718 it seemed like it was time to try union merge for language files and CHANGELOG again.

[koppor]

In 8380fcf we disabled union merge for language files. I don't remember which PRs broke. Let's see, how that worked out.

In ac08efb, we disabled CHANGELOG.md union merging.

I will adapt the release how to to disable union merge of CHANGELOG.md directly after the release. Otherwise, changelogs of released (!) versions will be changed when merging a PR started before the release and changing the CHANGELOG. After thinking a bit longer, the attribute reset does not help as git's conflict resolution might be too clever and find lines moved even far away.

[koppor]

All @JabRef/developers have to take care when merging PRs directly after a release: The sections of CHANGELOG.md of the released version should not be changed.

Possible solution: We create a file CHANGELOG.master.md to collect changes and touch CHANGELOG.md only during release time. But this might be confusing. TOP for devcall. 😇

[oscargus]

CHANGELOG is not so critical to me to have union merge in. It's just removing those three conflict markers in 12(?) translation files by hand every time someone has merge a PR with new translations in and you have to rebase that annoys me (and at least @Siedlerchr ).