Steps to Integrate Git In Your Agile Workflow
Let’s see above flow through an example.
To get started with GitFlow integration, make sure you have git flow installed on your machine. Run below command on Mac to install git-flow.
brew install git-flow-avh
Initialise Gitflow on your command line as below. Select the names of your production and release branches. You can also rename feature, bugfix, release, hotfix and support branches.
Initialise GitFlow
Now, let’s create a feature branch. Checkout at the development branch and execute the below command.
Create a feature branch
Add a file index.js and commit the file.
Create a commit on the feature branch
Once the feature is completed, execute below command to finish the feature branch. This command will merge the featured branch to development branch and delete it. You will be checked out at development branch.
Complete the feature branch
Run git checkout -b release/0.1.0 to create a release branch. Once the changes are ready, merge them to main and develop. A hotfix branch needs to be created from the main branch and merged to both main and develop branch.
This workflow will be on every sprint of the Agile Development Life Cycle.
Git Workflows For Agile Development Teams
Git Flow is a branching model that involves the use of different types of branches based on the objective of the task.
GitFlow Workflow
Table of Content
- The Git Flow strategy consists of the following branches
- Agile Development Lifecycle
- Steps to Integrate Git In Your Agile Workflow
- Choosing the Right Git Workflow
- Benefits of Git for Agile Teams
- Frequently Asked Questions on the Git Workflows