Feature branch workflow in Git - Cheat Sheet & Quick Revision

Recall & Review

beginner

What is a feature branch in Git?

A feature branch is a separate branch created from the main branch to develop a new feature independently without affecting the main code.

beginner

Why use a feature branch workflow?

It helps keep the main branch stable by isolating new features until they are fully tested and ready to merge.

beginner

What is the typical first step to start working on a feature branch?

Create a new branch from the main branch using: git checkout -b feature-branch-name

beginner

How do you merge a feature branch back into the main branch?

First switch to the main branch with git checkout main, then merge using git merge feature-branch-name.

intermediate

What should you do before merging your feature branch?

Make sure your feature branch is up to date with the main branch and all tests pass to avoid conflicts and errors.

What command creates a new feature branch and switches to it?

A git checkout -b feature-branch

B git branch feature-branch

C git merge feature-branch

D git commit -m 'feature branch'

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

Why should you keep feature branches separate from the main branch?

A To speed up the internet connection

B To delete the main branch

C To avoid breaking the main code while developing new features

D To make the repository smaller

Separating feature branches keeps the main branch stable and safe from unfinished or buggy code.

What is the correct order to merge a feature branch back into main?

A Delete feature branch, then merge main

B Merge feature branch, then switch to main branch

C Commit changes, then delete main branch

D Switch to main branch, then merge feature branch

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

What should you do if your feature branch is behind the main branch?

A Update your feature branch by merging or rebasing main into it

B Delete your feature branch

C Ignore the main branch changes

D Push your feature branch without updating

Updating your feature branch helps avoid conflicts when merging back to main.

Which of these is NOT a benefit of using feature branch workflow?

A Isolates new features for safer development

B Automatically fixes all bugs in the code

C Allows multiple developers to work independently

D Keeps main branch stable

Feature branches help organize work but do not automatically fix bugs.

Explain the steps to create, work on, and merge a feature branch in Git.

Think about the commands and order you use in Git.

Why is the feature branch workflow important for team projects?

Consider how teams avoid conflicts and bugs.