The current SCM approach taken in this repo seems to be to make all changes to trunk, and then create a release branch every time a new stable release is made. It is then assumed that any bugs discovered in a release would then be fixed on trunk and pushed to any affected release.

However it appears that changes are being made directly on the release branches and are not pushed back to trunk, or perhaps made separately to both branches - this means that when you compare the release/3.0.0 branch you find it's 35 commits ahead of the trunk (as well as being behind, which is expected).

A great example of this is that version.h on trunk still says it's at SDK 2.2.0, while the one in the release/3.0.0 branch is showing 3.0.0.

I tried a compare in order to merge the commits from release/3.0.0 but there are numerous changes to the binary lib files and it's impossible to know what's changed. Would it be possible to please update and keep trunk at the very latest of all files, including merging in any outstanding changes made on the release/x.x.x branches? This will make testing and debugging the SDK so much easier