Learn Git in 3 Hours- Merging Branches

This video tutorial covers the process of creating, switching, and merging branches in Git. It provides practical examples of working on feature branches and fixing bugs, explaining both fast forward and three-way merges. The tutorial concludes with a brief introduction to resolving merge conflicts.

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

• To work on a feature without affecting the main codebase

• To merge different repositories

• To reset the repository

• To delete old code

In the given scenario, why is it necessary to switch back to the master branch when a bug is reported?

• To ensure the bug fix is applied to the latest stable code

• To merge the feature branch

• To create a new repository

• To delete the feature branch

Which command is used to create and switch to a new branch simultaneously?

• git checkout -b

• git merge -b

• git branch -b

• git switch -b

What does the 'git status' command do?

• Shows the current branch and its status

• Merges two branches

• Deletes the current branch

• Creates a new branch

What is a fast-forward merge in Git?

• A merge that moves the branch pointer forward without creating a new commit

• A merge that deletes the branch

• A merge that resets the repository

• A merge that creates a new commit

Why might Git perform a fast-forward merge?

• Because the repository is empty

• Because there are merge conflicts

• Because the changes can be applied in a straight line

• Because the branches have diverged

What is a merge commit?

• A commit that deletes a branch

• A commit that creates a new branch

• A commit that has two parent commits

• A commit that resets the repository

How does a merge commit differ from a fast-forward merge?

• It moves the branch pointer forward

• It creates a new commit with two parents

• It resets the repository

• It deletes the branch

What is the purpose of deleting a branch after merging?

• To reset the repository

• To remove unnecessary clutter from the repository

• To create a new branch

• To merge another branch

What happens to the changes in a branch after it is deleted post-merge?

• The changes are moved to a new branch

• The changes are reset

• The changes remain in the merged branch

• The changes are lost