Feature branch workflow in Git - Practice Problems & Coding Challenges

Challenge - 5 Problems

💻 Command Output

intermediate

Output of creating and switching to a feature branch

What is the output of the following commands when run in a Git repository?

git branch feature-login
git checkout feature-login

Git

git branch feature-login
git checkout feature-login

A error: branch 'feature-login' already exists

B Switched to branch 'feature-login'

C fatal: not a git repository (or any of the parent directories): .git

D On branch master

💡 Hint

The second command switches your working directory to the new branch.

The first command creates a new branch named 'feature-login'. The second command switches to that branch, showing 'Switched to branch 'feature-login''.

🔀 Workflow

intermediate

Correct sequence to integrate a feature branch

Which option shows the correct sequence of commands to update your feature branch with the latest changes from the main branch before merging?

A git checkout main → git pull → git checkout feature → git merge main

B git checkout main → git merge feature → git pull

C git checkout feature → git merge main → git pull

D git checkout feature → git pull → git checkout main → git merge feature

💡 Hint

You need to update main first, then merge main into your feature branch.

First switch to main and pull the latest changes. Then switch to your feature branch and merge main into it to update your feature branch.

❓ Troubleshoot

advanced

Resolving a merge conflict in a feature branch

You tried to merge the main branch into your feature branch and got a conflict. What is the correct next step to resolve the conflict?

Git

git checkout feature
git merge main

A Delete the feature branch and recreate it from main

B Run 'git reset --hard' to discard all changes and try merging again

C Run 'git push' immediately to update the remote branch

D Edit the conflicting files to fix conflicts, then run 'git add' on those files and 'git commit' to complete the merge

💡 Hint

Conflicts must be fixed manually before committing.

When a merge conflict occurs, you must manually edit the files to resolve conflicts, stage the changes with 'git add', then commit to complete the merge.

✅ Best Practice

advanced

Best practice for naming feature branches

Which naming style is considered best practice for feature branches in Git?

A feature/login-page

B LoginPageFeature

C feature_login_page

D loginpagefeature

💡 Hint

Use lowercase letters and hyphens for readability.

Using lowercase letters with hyphens (kebab-case) is a common best practice for branch names because it improves readability and consistency.

🧠 Conceptual

expert

Why use feature branches in Git workflows?

What is the main advantage of using feature branches in a Git workflow?

A They merge all changes directly into the main branch without testing

B They prevent any code review before merging

C They isolate development of new features, allowing parallel work without affecting the main codebase

D They automatically deploy code to production when merged

💡 Hint

Think about how teams work on different features at the same time.

Feature branches allow developers to work on new features separately from the main codebase, reducing risk and enabling parallel development.