Gitflow workflow - Mini Project: Build & Apply

Gitflow Workflow Basics

📖 Scenario: You are working on a software project with a team. To keep your work organized, you use the Gitflow workflow. This workflow helps you manage new features, fixes, and releases in a clean way.

🎯 Goal: You will create the main branches used in Gitflow, add a feature branch, merge it back, and finally prepare a release branch. This will help you understand how Gitflow keeps your project organized.

📋 What You'll Learn

Create the develop branch from main

Create a feature branch called feature/login from develop

Merge feature/login back into develop

Create a release branch called release/1.0.0 from develop

Show the list of branches at the end

💡 Why This Matters

🌍 Real World

Teams use Gitflow to keep their code organized when many people work on different features and fixes at the same time.

💼 Career

Understanding Gitflow is important for software developers and DevOps engineers to collaborate smoothly and manage releases efficiently.

1

Create the develop branch from main

Create a new branch called develop from the existing main branch using the command git branch develop main.

Git

# Create the develop branch from main
# Your code here

Need a hint?

Use git branch develop main to create the develop branch from main.

2

Create a feature branch called feature/login from develop

Create a new branch called feature/login from the develop branch using the command git branch feature/login develop.

Git

git branch develop main
# Create the feature/login branch from develop
# Your code here

Need a hint?

Use git branch feature/login develop to create the feature branch from develop.

3

Merge feature/login back into develop

Switch to the develop branch using git checkout develop, then merge the feature/login branch into develop using git merge feature/login.

Git

git branch develop main
git branch feature/login develop
# Checkout develop branch
# Your code here
# Merge feature/login into develop
# Your code here

Need a hint?

First switch to develop with git checkout develop, then merge with git merge feature/login.

4

Create a release branch called release/1.0.0 from develop and list branches

Create a new branch called release/1.0.0 from develop using git branch release/1.0.0 develop. Then list all branches using git branch.

Git

git branch develop main
git branch feature/login develop
git checkout develop
git merge feature/login
# Create release/1.0.0 branch from develop
# Your code here
# List all branches
# Your code here

Need a hint?

Use git branch release/1.0.0 develop to create the release branch, then git branch to see all branches.