I think therefore that I should make a 0.38-main branch, so that I can continue to apply "safe" bug fixes to it while I apply the unsafe ones to "main" for incorporation into 0.39.
This way, eventually, we/d have 0.38-main, 0.39-main, etc, branches, along with the current "main" branch which would be perpetually on the path to the next release...
Does this sould like a good structure?
yes, and using tags for releases of -testX or -3 would make it easier to keep track of the current state of the branch and check out a specific version ...
tim