Clarify merging effects for new changelogs

We just did the first merge of master to release while the changed changelog system is in place (localized changelogs).

As of today I am not sure how Crowdin reacts if I empty changelog_master and move the content tochangelog_release. IMHO this could/would trigger new translations as it might just be considered a new file while the contained strings are already translated. While discussing those changelos changes in recent past I came to the conclusion it would not be a problem, however now I might either have a block in my head or it does not work such easy.

Need to think about it…feel free to spend ideas or correct me

Right now I think we might need to go with one single changelog file which is not merged between branches by merge rule. The only drawback would be, that in our nightlies the changes coming from release are not included.

BTW: @moving-bits Did you document somewhere how version_release.txt works?

[Lineflyer]

Unfortunately no time yet. I will try to look into it this weekend.

[rsudev]

Please be aware that even a merge strategy=ours does not prevent changes being merged from release to master. In simple words this merge strategy means, that only in case of a required merge (both bases have changed!) nothing is done. Edit: Depending on sources on the internet the behavior is described different…we should test it

According to my reading the docs and my experience from usage (in a completely different environment), the merge strategy=ours indeed prevents anything to be merged in. The state of the source tree is identical to the parent the merge was done onto.