+1 - the main branch should remain healthy. How will we avoid any conflicting commits that may go into “master" between steps 2 and 4?
On Mar 24, 2025 at 1:48:26 PM, Tsz Wo Sze <[email protected]> wrote: > Hi Ratis dev, > > The gRPC zero-copy feature [1] is still under development. However, since > the changes of the incomplete feature are merged to the master branch, the > gRPC > zero-copy features keep causing test failures in our CI. It becomes very > inconvenient for other developers. Therefore, we suggest moving the > zero-copy feature to a dev branch and removing it from the master branch. > > How to do it? > 1. Create a tmp branch using the 3.1.3 release tag. > 2. Merge the non-(gRPC zero-copy) commits from the master branch to it. > 3. Copy the current master branch to a new gRPC zero-copy branch > 4. Force push (i.e. overwrite) the tmp branch as the master branch. > > What do you think? > > Tsz-Wo > [1] gRPC zero-copy: https://issues.apache.org/jira/browse/RATIS-1931 >
