Why merging combines work in Git - Challenge Your Understanding

Challenge - 5 Problems

🧠 Conceptual

intermediate

Why does git merge combine work?

Imagine two friends writing a story separately on different pages. When they put their pages together, why does git merge combine their work?

A Because it creates a new snapshot that includes changes from both friends' pages.

B Because it deletes one friend's work and keeps only the other's.

C Because it copies one friend's page over the other without changes.

D Because it ignores all changes and keeps the original story only.

💡 Hint

Think about how git keeps track of changes from different sources.

Git merge creates a new snapshot that combines changes from both branches, preserving all work.

💻 Command Output

intermediate

Output of git merge with no conflicts

What is the output of the command git merge feature when the feature branch has new commits that do not conflict with the current branch?

Git

git merge feature

A

Updating abc1234..def5678
Fast-forward

B Automatic merge failed; fix conflicts and then commit the result.

C error: You have not concluded your merge (MERGE_HEAD exists).

D Already up to date.

💡 Hint

Think about what happens when the merge can be done without conflicts.

When the feature branch has new commits and no conflicts, git performs a fast-forward merge and shows the update range.

❓ Troubleshoot

advanced

Resolving merge conflicts

You run git merge feature and get a conflict message. What is the correct next step to combine work?

Git

git merge feature

A Delete the conflicting files and run <code>git commit</code>.

B Edit the conflicting files to fix conflicts, then run <code>git add</code> and <code>git commit</code>.

C Run <code>git push</code> immediately to overwrite remote.

D Run <code>git merge --abort</code> to cancel and lose all changes.

💡 Hint

Conflicts need manual fixing before completing the merge.

You must fix conflicts in files, stage them with git add, then commit to complete the merge.

🔀 Workflow

advanced

Merging multiple branches workflow

You have branches dev, feature1, and feature2. To combine work from both features into dev, which sequence is correct?

A 2,1,3,4

B 1,3,2,4

C 3,2,1,4

D 1,2,3,4

💡 Hint

Start by switching to the target branch before merging others.

You must checkout the target branch first, then merge feature branches one by one, then push.

✅ Best Practice

expert

Why prefer merging over overwriting work?

Why is it better to use git merge to combine work instead of manually copying files and committing?

A Because git merge deletes old files automatically.

B Because manually copying files is faster and safer.

C Because git merge preserves history and tracks changes from all contributors.

D Because manual copying avoids merge conflicts.

💡 Hint

Think about how git helps keep track of who changed what and when.

Git merge keeps the history of changes and contributors, making collaboration clear and traceable.