Git Flow In Few Words.

Source: https://wall.alphacoders.com/

What exactly is git flow???

It is a git development method that utilizes the branch that is a function of git. When developing with multiple people, if you adopt git without deciding the operation rule, conflicts will occur frequently and merge mistakes will occur.
It is git flow that can avoid such problems and make the most of git.

Branches

  • master: Branch to store released data.
  • develop: Branch for development.
  • release: Branch that prepares and fine-tunes before release .
  • feature: branch for feature development. Implement individual functions and resolve bugs.
  • hotfix: Branch for urgent corrections to released data.

More detail and explanation of each branch

Master

Often the master branch and the published production environment are the same source.

Develop

The one under development (for the next release if it is an update project) is reflected in perfect condition. It is the main branch of development work, and the sources newly created and modified by each developer are gathered in this branch. In terms of update projects, the difference from master is only for the next release.

Release

A branch that fine-tunes when released after development work in develop is complete.

⚠️ The release branch is created from the develop branch.

Example use case:

  • Source branch: develop
  • Marge Destination: develop and master

Feature

A branch that mainly develops and modifies new functions. For the branch name, describe the functions to be implemented after feature, such as feature/new_function. If a bug is found in a new function before the release, cut a branch for correction such as feature/bug_1982 from develop, and merge it into develop when the correction is completed.

⚠️ It is not good to merge into develop until debugging is finished.

Example use case:

  • Source branch: develop
  • Marge Destination: develop

Hotfix

A branch created if a bug is found after release. It’s also a branch that shouldn’t be created.

Example use case:

  • Source branch: master
  • Marge Destination: develop and master

More about git flow we can find in link below

Summary

If we make a mistake in the branch source or merge destination, it will cause a big accident , so we need to be careful! I think so it is important to understand and operate the roles of each branch of master, release, develop, feature, and hotfix in order to proceed smoothly.

 by the author.

--

--

--

DevOps Consultant. I’m strongly focused on automation, security, and reliability.

Love podcasts or audiobooks? Learn on the go with our new app.

Recommended from Medium

AWS Developer Associate Certification Summary Notes (Part 9)

How-To view your Automation OPPORTUNITIES in 3D

RISE — Complete Node Installation Guide + Server Preparations + Mainnet + Testnet (1.3.x)

7 Essential Steps to Rapidly Succeed as a Code Newbie

To Be a Principle

Career Options If You Are Not Good At Programming

Local file inclusion at IKEA.com

Get the Medium app

A button that says 'Download on the App Store', and if clicked it will lead you to the iOS App store
A button that says 'Get it on, Google Play', and if clicked it will lead you to the Google Play store
Maciej

Maciej

DevOps Consultant. I’m strongly focused on automation, security, and reliability.

More from Medium

Integrating Spring backend with Nexus server used as Maven and Docker repository

Announcing Oracle Identity and Access Management for .NET Apps using Oracle Autonomous Database

REST API Monitoring in Azure Application Insights

How to get only recently modified records for integration from Dynamics CRM using Azure Function C#.