Mastering AoneFlow: Alibaba’s Hybrid Branch Strategy for Scalable Releases

Introduction

Alibaba’s internal engineering practices include a unique branch management method called AoneFlow , which aims to match branch strategies with project scale and release cadence, ensuring flexible, efficient, and simple processes for product delivery.

Common Branch Models

Typical models include TrunkBased (single mainline with release branches, favoring continuous integration), GitFlow (multiple branches for features, releases, hotfixes, with complex merge rules), and GithubFlow (personal forks and pull‑request merges, suitable for distributed teams).

AoneFlow Overview

AoneFlow combines the ease of continuous integration from TrunkBased with the feature management of GitFlow while avoiding GitFlow’s overhead.

Rule 1 – Create a feature branch from the mainline

Before work starts, create a feature branch (named with a feature/ prefix) from the latest released mainline; all changes are committed to this branch, never directly to the mainline.

Rule 2 – Merge feature branches to form a release branch

All selected feature branches are merged into a newly created release branch (named with a release/ prefix). This release branch can correspond to specific environments such as release/test or release/prod, and can be linked to CI/CD pipelines for automated testing and deployment.

Rule 3 – After production deployment, merge the release branch back to the mainline

Once the release branch has been deployed to production, merge it into the mainline, tag the mainline, and delete the associated feature branches to keep the repository clean.

Experience Optimization

AoneFlow is supported by Alibaba’s internal collaborative development platform Aone , which automates the entire workflow: creating feature branches, generating release branches, provisioning test environments, and linking pipelines for code quality checks and automated deployments.

The platform also provides visual management of branch‑environment relationships, ensuring that each release branch is associated with the correct deployment target and that feature‑branch combinations can be easily adjusted.

Additional practices include prohibiting SNAPSHOT dependencies in production builds to guarantee reproducible artifacts, and using hot‑fix release branches when urgent fixes are needed.

Conclusion

Choosing the right branch strategy depends on project size and release rhythm; AoneFlow offers a hybrid approach that blends continuous integration friendliness with feature‑centric management, making it a compelling option for large‑scale SaaS development.