Josh, I see you made 3 commits to Calcite’s master branch yesterday to fix Avatica issues. There is a release vote for Calcite underway, and the last few changes for that are in branch-1.12 but not in master. Up to this point we have been able to keep the commit tree linear (i.e. there are no merge commits with two parents), and I would like to retain that.
To keep the tree linear, I will need to rebase master onto branch-1.12 after the release, then do a force push to master. Is that OK with you? Devs, Going forward, there are several solutions (lock the repository during release votes, force push to master after a a release, and allow the repository to have merge commits). And splitting the Calcite and Avatica repositories would at least allow Avatica development to continue during Calcite release votes. We should discuss the various options. But in my opinion, we are still small enough that the current policy (pausing commits during release votes, to keep a linear release history) is working fine. Julian
