Why merging combines work in Git - Quick Recap

Recall & Review

beginner

What does merging do in Git?

Merging in Git combines changes from different branches into one, bringing together work done separately.

beginner

Why is merging important when multiple people work on the same project?

Merging helps combine everyone's changes so the project stays up to date and no work is lost.

intermediate

What happens if two branches change the same part of a file during a merge?

Git will show a conflict that needs to be fixed manually before finishing the merge.

intermediate

How does Git know what changes to combine during a merge?

Git compares the common starting point of branches and applies the changes made on each branch.

intermediate

What is a fast-forward merge?

A fast-forward merge happens when the branch being merged is ahead and can be added without creating a new merge commit.

What does Git merging do?

A Reverts all changes

B Deletes branches permanently

C Creates a new repository

D Combines changes from different branches

Merging combines changes from different branches into one.

What must you do if Git finds conflicting changes during a merge?

A Manually fix the conflicts

B Delete the repository

C Ignore the conflicts

D Restart the computer

Conflicts must be fixed manually before completing the merge.

When does a fast-forward merge happen?

A When branches are deleted

B When branches have conflicts

C When the branch is ahead and no new merge commit is needed

D When the repository is cloned

Fast-forward merge happens if the branch can be added directly without a merge commit.

Why is merging useful in teamwork?

A It creates new branches automatically

B It combines everyone's work into one place

C It deletes old files

D It stops others from working

Merging helps combine work from different people so the project stays updated.

What does Git compare to merge changes?

A The common starting point of branches

B The size of files

C The number of commits

D The date of last commit

Git uses the common ancestor to understand what changes to combine.

Explain in your own words why merging is like combining pieces of a puzzle.

Think about how separate puzzle pieces come together to form a full picture.

Describe what happens when two people change the same file and then try to merge their work.

Imagine two friends writing different endings to the same story.