Git Git Branching and Merging

Question 1

Which command creates a new branch and switches to it in one step?

Accepted Answer

git checkout -b new-branch

Answer

The `git checkout -b new-branch` command creates a new branch and immediately switches to it.

Question 2

What does a fast-forward merge do?

Accepted Answer

Moves the base branch pointer forward to the tip of the feature branch

Answer

A fast-forward merge simply advances the pointer of the base branch to the latest commit of the feature branch when there is a linear history.

Question 3

Which command lists all local and remote branches?

Accepted Answer

git branch -a

Answer

The `git branch -a` command displays all local and remote-tracking branches.

Question 4

What is a merge conflict?

Accepted Answer

When two branches have changes to the same lines of a file that Git cannot automatically reconcile

Answer

A merge conflict occurs when two branches modify the same lines of a file and Git cannot determine which change to keep.

Question 5

Which `git merge` option always creates a merge commit even if fast-forward is possible?

Accepted Answer

--no-ff

Answer

The `--no-ff` flag forces Git to create a merge commit regardless of whether a fast-forward is possible.

Git Practice Test