GitHub Branching and Merging Fundamentals

Submit

2. Which of the following best describes a feature branch workflow?

All developers work directly on the main branch

Each feature is developed on a separate branch and merged via PR

Branches are created only for bug fixes

The main branch is never merged into feature branches

Submit

4. What is a 'stale branch' in Git?

A branch that has not been updated in a long time

A branch with uncommitted changes

A branch that cannot be merged

A branch with unresolved conflicts

Submit

6. How do you switch to an existing branch?

Git branch switch-to branch-name

Git checkout branch-name

Git switch branch-name

Both b and c are correct

7. What is the difference between 'git merge' and 'git rebase'?

Merge creates a merge commit; rebase rewrites history with a linear timeline

Merge is faster than rebase

Rebase is only available on GitHub

They are identical operations with different names

Submit

9. Which command shows the commit history of the current branch?

Git history

Git log

Git show-commits

Git branch --history

10. What does 'rebasing' accomplish in Git?

It permanently deletes old commits

It reapplies commits from one branch onto another to maintain a linear history

It prevents future merges on a branch

It creates a backup of uncommitted changes

11. What is the primary purpose of creating a branch in Git?

To isolate feature development without affecting the main codebase

To create a backup of the repository

To increase repository storage capacity

To restrict user access to certain files

12. What is the purpose of a Pull Request (PR) in GitHub?

To request data from the repository server

To propose and review code changes before merging

To download files from GitHub

To create a backup of the branch

13. How do you delete a local branch that is no longer needed?

Git remove branch-name

Git branch -d branch-name

Git delete branch-name

Git branch --remove branch-name

14. What command lists all branches in your local repository?

Git show branches

Git list -branches

Git branch

Git branches --all

Submit

16. Which merge strategy combines all commits from a feature branch into a single commit on the target branch?

Recursive merge

Squash merge

Fast-forward merge

Three-way merge

17. What is a merge conflict?

When two branches cannot be combined due to overlapping changes

When a user lacks permissions to merge code

When the repository server is unavailable

When branch names contain invalid characters

Submit

19. What does 'HEAD' refer to in Git?

The repository administrator

A pointer to the current branch and commit

The main branch of the repository

The first commit in the repository history

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

Git branch -new

Git checkout -b branch-name

Git switch --create branch-name

Both b and c are correct

GitHub Foundations Branching and Merging Quiz

1. When resolving a merge conflict manually, you must choose between ____.

2.

What first name or nickname would you like us to use?

2. Which of the following best describes a feature branch workflow?

3. The 'origin' in 'origin/main' refers to ____.

4. What is a 'stale branch' in Git?

5. In GitHub, branch protection rules prevent ____.

6. How do you switch to an existing branch?

7. What is the difference between 'git merge' and 'git rebase'?

8. A merge commit is created when ____.

9. Which command shows the commit history of the current branch?

10. What does 'rebasing' accomplish in Git?

11. What is the primary purpose of creating a branch in Git?

12. What is the purpose of a Pull Request (PR) in GitHub?

13. How do you delete a local branch that is no longer needed?

14. What command lists all branches in your local repository?

15. A fast-forward merge occurs when ____.

16. Which merge strategy combines all commits from a feature branch into a single commit on the target branch?

17. What is a merge conflict?

18. In Git, the default branch is typically named ____.

19. What does 'HEAD' refer to in Git?

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