Feature branch workflow in Git - Interactive Code Practice

Practice - 5 Tasks

1fill in blank

easy

Complete the command to create a new feature branch named 'feature1'.

Git

git checkout -b [1]

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

Adevelop

Bmain

Cfeature1

Dmaster

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'main' or 'master' instead of the new feature branch name.

Forgetting the '-b' flag to create the branch.

The command git checkout -b feature1 creates and switches to a new branch named 'feature1'.

2fill in blank

medium

Complete the command to push the feature branch 'feature1' to the remote repository.

Git

git push origin [1]

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

Afeature1

Bmain

Cdevelop

Dmaster

Attempts:

3 left

💡 Hint

Common Mistakes

Pushing the 'main' or 'master' branch instead of the feature branch.

Omitting the remote name 'origin'.

The command git push origin feature1 uploads the 'feature1' branch to the remote repository.

3fill in blank

hard

Fix the error in the command to merge the feature branch 'feature1' into 'main'.

Git

git checkout main
 git [1] feature1

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

Amerge

Bpush

Ccommit

Dbranch

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'push' instead of 'merge'.

Using 'commit' or 'branch' which do not merge branches.

The command git merge feature1 merges the changes from 'feature1' into the current branch 'main'.

4fill in blank

hard

Fill both blanks to create a feature branch from 'develop' and switch to it.

Git

git checkout [1] [2] feature2

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

A-b

B-d

Cdevelop

Dmain

Attempts:

3 left

💡 Hint

Common Mistakes

Using '-d' which deletes branches instead of '-b'.

Using 'main' instead of 'develop' as the base branch.

The command git checkout develop -b feature2 creates a new branch 'feature2' based on 'develop' and switches to it.

5fill in blank

hard

Fill all three blanks to delete a local feature branch named 'feature2' after merging.

Git

git [1] -[2] [3]

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

Abranch

Bdelete

Cfeature2

Dd

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'delete' instead of 'branch' as the git command.

Using '-delete' instead of '-d' as the flag.

Deleting the wrong branch name.

The command git branch -d feature2 deletes the local branch 'feature2' safely after it has been merged.

Practice

1. What is the main purpose of using a feature branch in Git?

easy

A. To merge all changes immediately without review

B. To delete the main branch permanently

C. To keep new work separate from the main code until it's ready

D. To create backups of the repository

Solution

1. Step 1: Understand the role of feature branches

   Feature branches isolate new development work from the main codebase.

2. Step 2: Identify the correct purpose

   This isolation allows safe development without affecting the stable main branch.

3. Final Answer:

   To keep new work separate from the main code until it's ready -> Option C

4. Quick Check:

   Feature branch purpose = isolation [OK]

Hint: Feature branches isolate new work from main code [OK]

Common Mistakes:

• Thinking feature branches delete main branch
• Assuming feature branches merge immediately
• Confusing feature branches with backups

2. Which Git command correctly creates and switches to a new feature branch named feature-login?

easy

A. git branch feature-login

B. git push feature-login

C. git merge feature-login

D. git checkout -b feature-login

Solution

1. Step 1: Understand branch creation and switching

   The command git checkout -b branch-name creates and switches to the new branch in one step.

2. Step 2: Identify the correct command

   git checkout -b feature-login is the command that creates and switches to the new branch.

3. Final Answer:

   git checkout -b feature-login -> Option D

4. Quick Check:

   Create and switch branch = git checkout -b [OK]

Hint: Use git checkout -b to create and switch branch [OK]

Common Mistakes:

• Using git branch without switching
• Confusing git merge with branch creation
• Trying to push before creating branch

3. Given the commands below, what will be the current branch after execution?

git checkout -b feature-ui
 git commit -m "Add UI"
 git checkout main
 git merge feature-ui

medium

A. feature-ui

B. main

C. detached HEAD

D. No branch (error)

Solution

1. Step 1: Trace branch switching commands

   The commands switch to feature-ui, then back to main.

2. Step 2: Understand merge and current branch

   After merging feature-ui into main, the current branch remains main.

3. Final Answer:

   main -> Option B

4. Quick Check:

   Last checkout branch = current branch [OK]

Hint: Last git checkout sets current branch [OK]

Common Mistakes:

• Assuming merge switches branch
• Confusing commit branch with current branch
• Thinking merge detaches HEAD

4. You created a feature branch and made commits, but when you try to merge it into main, Git says "Already up to date." What is the likely problem?

medium

A. You are on the wrong branch when merging

B. Your working directory has uncommitted changes

C. The feature branch has diverged from main

D. You forgot to push the feature branch to remote

Solution

1. Step 1: Analyze the error message context

   "Already up to date" means Git sees no new changes to merge.

2. Step 2: Check the branch where merge is run

   If you run git merge feature-branch while not on main, it merges into the wrong branch or shows no effect.

3. Final Answer:

   You are on the wrong branch when merging -> Option A

4. Quick Check:

   Merge branch context matters [OK]

Hint: Always checkout main before merging feature branch [OK]

Common Mistakes:

• Merging while on feature branch instead of main
• Assuming push affects local merge
• Ignoring branch status before merge

5. Your team uses feature branches. You finished a feature and want to merge it into main. Which sequence of commands correctly follows the feature branch workflow?

hard

A. git checkout main; git merge feature-branch; git push origin main; git branch -d feature-branch

B. git merge feature-branch; git checkout main; git push origin main

C. git checkout feature-branch; git push origin main; git merge main

D. git push origin feature-branch; git checkout main; git merge feature-branch

Solution

1. Step 1: Switch to main branch before merging

   You must be on main to merge the feature branch into it.

2. Step 2: Merge, push, and clean up

   After merging, push changes to remote and delete the feature branch locally to keep repo clean.

3. Final Answer:

   git checkout main; git merge feature-branch; git push origin main; git branch -d feature-branch -> Option A

4. Quick Check:

   Checkout main, merge, push, delete branch [OK]

Hint: Always merge feature into main, then push and delete branch [OK]

Common Mistakes:

• Merging without switching to main
• Pushing wrong branch
• Not deleting feature branch after merge