Marian G.

The strange thing is: When I do a fresh pull of the open-Source version and compare the release/2.54.0 branch with our internal master (keep in mind we already merged the 2.54 version) I still see around 12.000 new commits and many conflicts, although the merge was done in January.

Hi I had exactly the same issue. The strange thing is that we already merged the internal master with the 2.54.0 release in January. That was a normal merge with some minor conflicts and roughly 300 commits. Then I wanted to upgrade to 2.55.3 and I also got many conflicts and around 12.000 commits from 2017 even. So, can it be that somehow the git history status was changed and now the local version can not be easily compared to the remote version?