Gitflow workflow - Cheat Sheet & Quick Revision

Recall & Review

beginner

What is the main purpose of the Gitflow workflow?

Gitflow workflow helps teams manage feature development, releases, and bug fixes in an organized way using separate branches.

beginner

Name the two main branches in Gitflow that always exist.

The two main branches are main (or master) for production-ready code and develop for ongoing development.

beginner

What is the role of a feature branch in Gitflow?

A feature branch is used to develop a new feature. It branches off from develop and merges back into develop when done.

intermediate

Explain what a release branch is used for in Gitflow.

A release branch prepares code for production. It allows final testing and fixes before merging into main and develop.

intermediate

How does the hotfix branch work in Gitflow?

Hotfix branches fix urgent bugs in production. They branch from main, fix the issue, then merge back into both main and develop.

Which branch do you create a feature branch from in Gitflow?

A main

B develop

C release

D hotfix

Feature branches always start from the develop branch to keep new features separate from production.

What is the purpose of the release branch?

A To develop new features

B To store archived code

C To fix urgent bugs in production

D To prepare code for production with final testing

Release branches allow final testing and fixes before merging code into main for production.

After finishing a hotfix, where should you merge the changes?

A Both main and develop

B Only main

C Only develop

D Only feature branch

Hotfix changes must go into both main (production) and develop (ongoing development) branches.

Which branch always contains production-ready code?

A develop

B feature

C main

D release

The main branch holds the stable, production-ready code.

When do you delete a feature branch in Gitflow?

A After merging it into develop

B After merging it into main

C Before starting work

D Never

Feature branches are deleted after merging into develop to keep the repository clean.

Describe the main branches and their roles in the Gitflow workflow.

Think about which branch holds stable code and which one holds new work.

Explain how feature, release, and hotfix branches work together in Gitflow.

Consider the flow from development to production and urgent fixes.