In terms of the RELEASE-1.3* branches and the EE4J_8 branches, I am now wondering what the best thing for Jakarta Transactions is as I don't know a way to get those commits back into master without perhaps some history rewriting. Perhaps what I could do is protect the RELEASE-1.3.3 branch, given that was the EE4J_8 release, and delete some others branches, although that could in theory lose the commits for 1.3.1 and 1.3.2 at some point. Further complicating this, looking at
https://github.com/eclipse-ee4j/jta-api/commits/RELEASE-1.3.2 and
https://github.com/eclipse-ee4j/jta-api/commits/1.3.2 (and similarly for 1.3.1) they don't seem to have the same SHA-1 for commits used to move to the released version anyway (although RELEASE-1.3.3 and 1.3.3 do seem to share the SHA-1). If we really want to preserve the 1.3.2 and 1.3.1 tagged commits, I could reset their corresponding branches to the tagged version and try yo protect them too. If that is what we want to do then I think it should be OK to lose the commits currently on those branches that updated the branches to the respective version, and also lose the subsequent commits that move that branch to the next snapshot version.