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

The `--squash` option collapses all commits from the source branch into a single staged change that you then commit manually.

Question 2

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

Accepted Answer

git branch -m old-name new-name

Answer

The `git branch -m old-name new-name` command renames the specified local branch.

Question 3

What is the 'detached HEAD' state?

Accepted Answer

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

Answer

Detached HEAD occurs when HEAD points to a specific commit rather than a named branch, usually after checking out a commit directly.

Question 4

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

Accepted Answer

Merges more than two branches simultaneously

Answer

The octopus merge strategy is designed to merge more than two branches at once, ideal for integrating multiple feature branches simultaneously.

Question 5

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

Accepted Answer

Stage the resolved files with `git add` then commit

Answer

After manually resolving conflicts, you must stage the resolved files with `git add` and then create the merge commit.

Git Practice Test