Complete Git Guide: Understand and Master Git and GitHub - Three-Way Merge

The video tutorial covers the concepts of fast forward and 3-way merges in Git. It explains how a fast forward merge is possible when the receiving branch has no new commits since the feature branch was created. The tutorial then delves into the 3-way merge process, which is used when both branches have diverged. It describes how Git creates a new merge commit that incorporates changes from both branches without altering the feature branch. The video concludes with a practical application of these concepts in a project setting.

What is a prerequisite for performing a Fast Forward Merge?

• The receiving branch must have additional commits.

• The feature branch must be deleted first.

• The receiving branch must not have any new commits since the feature branch was created.

• The feature branch must be merged into another branch first.

Why can't a Fast Forward Merge be used when there are additional commits in the receiving branch?

• It would result in a loss of commit history.

• It would automatically delete the feature branch.

• It would create duplicate commits.

• It would merge unrelated branches.

What does a 3-Way Merge create to combine changes from two branches?

• A duplicate of the master branch

• A backup of the feature branch

• A new merge commit

• A new feature branch

In a 3-Way Merge, what is the role of the 'ancestor' commit?

• It is the last commit in the feature branch.

• It is the first common commit between the two branches.

• It is the most recent commit in the master branch.

• It is a commit that is not part of either branch.

What is the main advantage of using a 3-Way Merge over a Fast Forward Merge?

• It requires fewer commands to execute.

• It preserves the commit history of both branches.

• It allows for automatic branch deletion.

• It simplifies the branch structure.

What happens to the feature branch after a 3-Way Merge?

• It is reset to the master branch.

• It remains unchanged and can be deleted manually.

• It is automatically deleted.

• It is merged into another branch.

Why do the commits in the feature branch remain intact after it is deleted post-merge?

• Because they are backed up automatically.

• Because the merge commit points to them as parents.

• Because they are copied to the master branch.

• Because they are stored in a separate repository.