Gitflow workflow - Interactive Code Practice

Practice - 5 Tasks

1fill in blank

easy

Complete the command to create a new feature branch in Gitflow.

Git

git checkout -b [1] develop

Drag options to blanks, or click blank then click option'

Afeature/new-feature

Bhotfix/urgent-fix

Crelease/v1.0

Dmaster

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'master' branch instead of 'develop' as base.

Naming the branch with 'hotfix/' prefix for a feature.

In Gitflow, feature branches start with feature/ and branch off from develop.

2fill in blank

medium

Complete the command to finish a feature branch and merge it back into develop.

Git

git checkout develop && git [1] feature/new-feature

Drag options to blanks, or click blank then click option'

Arebase

Bbranch

Cmerge

Dcommit

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'git branch' which only lists or creates branches.

Using 'git commit' which records changes but does not merge.

To finish a feature, you merge it back into the develop branch using git merge.

3fill in blank

hard

Fix the error in the command to start a hotfix branch from master.

Git

git checkout -b [1] master

Drag options to blanks, or click blank then click option'

Ahotfix/1.0.1

Bdevelop

Cfeature/hotfix-1

Drelease/1.0.1

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'feature/' prefix for a hotfix branch.

Starting hotfix branch from 'develop' instead of 'master'.

Hotfix branches start with hotfix/ and branch from master to fix urgent bugs.

4fill in blank

hard

Fill both blanks to create a release branch and push it to remote.

Git

git checkout -b [1] develop && git push origin [2]

Drag options to blanks, or click blank then click option'

Arelease/v2.0

Bfeature/v2.0

Dhotfix/v2.0

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'feature/' prefix for a release branch.

Pushing a different branch name than created.

Release branches start with release/ and are created from develop. You push the same branch name to remote.

5fill in blank

hard

Fill all three blanks to finish a hotfix: merge into master, tag it, and merge into develop.

Git

git checkout master && git [1] hotfix/1.0.1 && git tag [2] && git checkout develop && git [3] hotfix/1.0.1

Drag options to blanks, or click blank then click option'

Amerge

Bv1.0.1

Dcommit

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'commit' instead of 'merge' to combine branches.

Forgetting to tag the release after merging.

Finish a hotfix by merging it into master, tagging the release, then merging it back into develop.