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

git branch new-branch

Answer

git switch new-branch

Answer

git create new-branch

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

Creates a new merge commit

Answer

Deletes the feature branch automatically

Answer

Squashes all commits into one

Question 3

Which command lists all local and remote branches?

Accepted Answer

git branch -a

Answer

git branch

Answer

git branch -r

Answer

git branch --list

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

When a branch is deleted during a merge

Answer

When the network fails during a push

Answer

When a commit message is missing

Question 5

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

Accepted Answer

--no-ff

Answer

--squash

Answer

--rebase

Answer

--force

Question 6

How do you delete a local branch in Git?

Accepted Answer

git branch -d branch-name

Answer

git delete branch-name

Answer

git remove branch-name

Answer

git branch --remove branch-name