Ethan, Thanks for raising this discussion. Since we have the new website, moving docs from confluence to the new website is a good idea. And in the future, all new documents' first priority location is the new website too.
For the detailed feature branch git merge command process, based on my past experience, I would suggest we leave the option to feature branch maintainers. I have maintained a few feature branches since working on HDFS and Ozone. Initially I use rebase too when the feature is not big, only a dozen commits. But later when working on big features, the rebase effort became more and more heavy, then I switched to merge. After experiencing using both merge and rebase, I favor merge more than rebase now. But I guess there is someone who may like using rebase more. So it's better to leave the choice to the feature branch maintainers. BTW, apart from STS and ZDU feature branch, object ttl(already merged) , and short-circuit feature branch is going to merge too. Bests, Sammi On Sat, 11 Jul 2026 at 03:17, Ethan Rose <[email protected]> wrote: > Hi Ozone devs, > > As part of our ongoing documentation updates, I am working on docs for > feature branch usage which will live under the developer guide on the > website. This includes: > - Porting over the completed feature branch merge checklists which lived in > confluence > - Updating our current feature branch merge checklist > - Adding a guide on feature branch management and merge processes, which > had never been formally written down. > > The last point is especially important since it details the exact way to > use merge and rebase to incorporate the feature branch into master for > optimal git history. > > The PR is https://github.com/apache/ozone-site/pull/463. It would be great > if the community could leave feedback on this PR so that the updated > practices can go into effect once it is merged. Note that we have STS and > ZDU feature branches getting ready to merge soon. > > Thanks, > Ethan >
