@ddemidov I may have done something wrong with branches since the commits related to previous changes (private tables in Sound) are visible here. I don't know if this breaks something.

I think you forgot to git pull while on develop branch before checking out the new branch. The following commands (while on sphinx_py3 branch) should fix this:

git fetch origin  # fetch the latest changes from upstream
git reset --hard origin/develop # reset the branch to origin/develop
git cherry-pick 61d62f883659c65db271a4f5afdbd36f45924596 # pick the one commit that matters (it will still be in local cache)
git push -f # push the branch to your fork, overwriting its history

And by the way, I can confirm this still works on Arch linux.

In fact, I think that github's 'squash and merge' should be enough in this case.

Thanks! And do not forget to update your develop branch before making new changes 😏

Thanks for advanced Git lesson 😉

What happened is that I made the sphinx3 changes while working on the Sound class updates, to be able to check the generated documentation. But I did not want to include these changes with the source code modifications, since they were not really related.

What I should have done is including them in the change tracking only after the Sound class modifications merge. This way they would have appeared in their own "sprint".