Gitflow workflow - Practice Problems & Coding Challenges

Challenge - 5 Problems

🧠 Conceptual

intermediate

Purpose of the 'develop' branch in Gitflow

In the Gitflow workflow, what is the main purpose of the develop branch?

A It is the branch where hotfixes are directly applied to fix production bugs.

B It serves as the integration branch where features are merged before release.

C It is the main branch that always contains production-ready code.

D It is used only for experimental features that may never be released.

💡 Hint

Think about where developers combine their work before making a release.

The develop branch is where all feature branches are merged. It acts as a preparation area for the next release, integrating new features and fixes before they go to production.

💻 Command Output

intermediate

Output of starting a feature branch in Gitflow

What is the expected output when running the command git flow feature start login in a Gitflow-enabled repository?

Git

git flow feature start login

A

Switched to a new branch 'feature/login'
Summary of commands to finish the feature.

B Error: 'feature/login' branch already exists.

C

Switched to branch 'develop'
No feature branch created.

D Feature 'login' started but not switched to the branch.

💡 Hint

Starting a feature branch creates and switches to it.

The git flow feature start command creates a new feature branch from develop and switches to it, showing a summary of how to finish the feature later.

🔀 Workflow

advanced

Correct sequence to finish a release in Gitflow

What is the correct sequence of steps to finish a release branch in Gitflow?

A 1,2,3,4

B 3,1,2,4

C 1,3,2,4

D 2,1,3,4

💡 Hint

Think about finalizing the release for production and syncing develop.

First, the release branch is merged into main to prepare production code. Then a tag is created on main for the release version. Next, the release branch is merged back into develop to include any final changes. Finally, the release branch is deleted.

❓ Troubleshoot

advanced

Error when finishing a hotfix branch

You run git flow hotfix finish v1.2.1 but get an error saying fatal: You are not currently on a branch. What is the most likely cause?

A You have uncommitted changes preventing finishing the hotfix.

B The hotfix branch 'hotfix/v1.2.1' does not exist.

C You are in detached HEAD state and not on the hotfix branch.

D The main branch is missing and cannot merge hotfix.

💡 Hint

Check which branch you are currently on before finishing.

The error means you are not on any branch (detached HEAD). Gitflow commands require you to be on the hotfix branch to finish it. Switching to the hotfix branch first fixes this.

✅ Best Practice

expert

Recommended practice for naming feature branches in Gitflow

Which naming convention for feature branches follows best practices in Gitflow to keep the repository organized?

A loginFeature

B featureLogin

C feat_login

D feature/login-page

💡 Hint

Consider readability and consistency with Gitflow defaults.

Gitflow recommends using feature/ prefix followed by a descriptive, lowercase, hyphen-separated name. This keeps branches clear and consistent.