Making release branches is another straightforward branching operation. It also creates well-defined phases of development (e.g., it's easy to say, “This week we're preparing for version 4.0,” and to actually see it in the structure of the repository). Using a dedicated branch to prepare releases makes it possible for one team to polish the current release while another team continues working on features for the next release. In addition, it should be merged back into develop, which may have progressed since the release was initiated. Once it's ready to ship, the release branch gets merged into main and tagged with a version number. Creating this branch starts the next release cycle, so no new features can be added after this point-only bug fixes, documentation generation, and other release-oriented tasks should go in this branch. Once develop has acquired enough features for a release (or a predetermined release date is approaching), you fork a release branch off of develop. Of course, you also get to leverage all the benefits of the Feature Branch Workflow: pull requests, isolated experiments, and more efficient collaboration. In addition to feature branches, it uses individual branches for preparing, maintaining, and recording releases. Gitflow can be used for projects that have a scheduled release cycle and for the DevOps best practice of continuous delivery. This workflow doesn’t add any new concepts or commands beyond what’s required for the Feature Branch Workflow. Instead, it assigns very specific roles to different branches and defines how and when they should interact. They can also introduce conflicting updates. These long-lived feature branches require more collaboration to merge and have a higher risk of deviating from the trunk branch. Under this model, developers create a feature branch and delay merging it to the main trunk branch until the feature is complete. Compared to trunk-based development, Gitflow has numerous, longer-lived branches and larger commits. It was first published and made popular by Vincent Driessen at nvie. Gitflow is an alternative Git branching model that involves the use of feature branches and multiple primary branches.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |