Embedded Files
Trunk based strategy
Trunk based strategy
In this strategy, developers merge small, frequent changes to a core branch such as a main or master labeled branch
Developers work on short-lived branches with a few small commits. To learn more about trunk-based development, visit the StatusNeo website.
Gitflow strategy
Gitflow strategy
Gitflow involves using feature branches and multiple primary branches in addition to the main branch. Often, these primary branches are based on different environments where changes are deployed into branches such as Develop and QA branches.
Primary branches are long-lived, and more commits merge into them. To learn more about this strategy, visit the Atlassian Gitflow website.
Merging changes
Merging changes
Developers will commit their changes to their branch. When their work is ready to be merged with changes from other developers, a pull request (or merge request) is opened asking for feedback and approval.
Pull requests provide a formal solution for sharing code and knowledge among team members. They are essential in delivering higher-quality software in a CI/CD development lifecycle if used effectively.
What to do next
What to do next
Page updated
Report abuse