Hello,
I want to let you knows know that glade upstream just merged my backports for the "topological sorting algorithm" into glade-3-8 branch. This means that we can now use upstream glade for our geany.glade as the major outstanding deficiency is fixed: it now sorts the generated xml in a predictable and stable manner, suitable for diff-review and probably git merges too.
The backports should appear in 3.8.5 if you'd like to wait for a realease.
Best regards