Git Git Branching and Merging 2

Question 1

What is the purpose of `git merge --squash`?

Accepted Answer

Combines all commits from a branch into one staged change without committing

Answer

Deletes all commits on the branch

Answer

Forces a fast-forward merge

Answer

Merges only the last commit

Question 2

Which command renames a local branch from `old-name` to `new-name`?

Accepted Answer

git branch -m old-name new-name

Answer

git rename old-name new-name

Answer

git branch --rename old-name new-name

Answer

git checkout -r old-name new-name

Question 3

What is the 'detached HEAD' state?

Accepted Answer

When HEAD points directly to a commit rather than a branch reference

Answer

A corrupted repository state

Answer

When a branch has no commits

Answer

When remote and local branches are out of sync

Question 4

Which strategy does `git merge -s octopus` use?

Accepted Answer

Merges more than two branches simultaneously

Answer

Merges two branches with conflict resolution

Answer

Creates an empty merge commit

Answer

Resets both branches to a common ancestor

Question 5

After resolving merge conflicts, what is the correct next step?

Accepted Answer

Stage the resolved files with `git add` then commit

Answer

Run `git merge --continue`

Answer

Run `git rebase --continue`

Answer

Restart the merge with `git merge --reset`

Question 6

What does `git branch --merged` display?

Accepted Answer

Branches whose tips are reachable from the current HEAD

Answer

Branches that have been pushed to remote

Answer

All branches with merge commits

Answer

Branches currently checked out