Fig 4. Gitflow Workflow Putting it all together (Image Courtesy: Atlassian.com Gitflow Workflow)
In this post, you will learn about some of the best practices in relation to managing your development and production releases using GitFlow Workflow.
Fig 1. Representing master, develop, feature branches (Image Courtesy: Atlassian.com Gitflow Workflow)
The following represents the workflow steps for merging the code changes from the feature branch to the develop branch.
Fig 2. Representing master, release, develop, feature branches (Image Courtesy: Atlassian.com Gitflow Workflow)
Fig 3. Representing master, develop, hotfix, release, feature branches (Image Courtesy: Atlassian.com Gitflow Workflow)
The diagram below represents the holy grail of Gitflow Workflow.
Fig 4. Gitflow Workflow Putting it all together (Image Courtesy: Atlassian.com Gitflow Workflow)
The following questions could be used for testing your learning on GitFlow workflows. These could also be used as interview questions and answers.
[wp_quiz id=”7455″]
In this post, you learned about different Gitflow workflows which could be used for development, testing/QA, Hotfix, and production releases. Briefly speaking, one or more developers working on a functionality should fork a develop branch (integration branch) from which they could fork their user branch and work independently on their branches. At regular intervals, they should commit to their user/personal branches. The commits from user branches should be merged regularly to the develop branch. At the time of release, a release branch should be forked off of the develop branch. This could also be called as QA branch. At the time of release, this release branch should be merged with master and also develop branch (in case of bug fixes on release branch). Please feel free to suggest/comment.
Last updated: 25th Jan, 2025 Have you ever wondered how to seamlessly integrate the vast…
Hey there! As I venture into building agentic MEAN apps with LangChain.js, I wanted to…
Software-as-a-Service (SaaS) providers have long relied on traditional chatbot solutions like AWS Lex and Google…
Retrieval-Augmented Generation (RAG) is an innovative generative AI method that combines retrieval-based search with large…
The combination of Retrieval-Augmented Generation (RAG) and powerful language models enables the development of sophisticated…
Have you ever wondered how to use OpenAI APIs to create custom chatbots? With advancements…