Three-way merge in Git - Practice Problems & Coding Challenges

Challenge - 5 Problems

🧠 Conceptual

intermediate

Understanding the base in a three-way merge

In a three-way merge, what role does the 'base' commit play?

A It is the latest commit on the target branch after the merge is complete.

B It is the commit that is discarded during the merge process.

C It is the commit that contains the merge conflict markers.

D It is the common ancestor of the two branches being merged, used to identify changes.

💡 Hint

Think about what helps Git compare changes from two branches.

The base commit is the common ancestor of the two branches. Git uses it to compare changes made in each branch to detect conflicts and merge differences.

💻 Command Output

intermediate

Output of a three-way merge conflict

What output does Git produce when a three-way merge results in a conflict?

Git

git merge feature-branch

A Already up to date.

B Auto-merging file.txt\nCONFLICT (content): Merge conflict in file.txt\nAutomatic merge failed; fix conflicts and then commit the result.

C error: pathspec 'feature-branch' did not match any file(s) known to git

D Merge made by the 'recursive' strategy.\n file.txt | 2 ++\n 1 file changed, 2 insertions(+)

💡 Hint

Look for messages indicating conflicts.

When a merge conflict occurs, Git shows 'CONFLICT' messages and tells you to fix conflicts manually before committing.

🔀 Workflow

advanced

Steps to resolve a three-way merge conflict

Which sequence correctly describes the steps to resolve a three-way merge conflict in Git?

A 1,2,3,4

B 2,1,3,4

C 1,3,2,4

D 3,1,2,4

💡 Hint

Think about the logical order from detecting conflicts to finishing the merge.

First, you check which files have conflicts, then edit them to fix conflicts, stage the fixed files, and finally commit the merge.

❓ Troubleshoot

advanced

Cause of repeated merge conflicts in a three-way merge

You keep getting the same merge conflicts every time you try to merge a feature branch into main. What is the most likely cause?

A You did not stage the resolved files before committing the merge.

B The feature branch was deleted before merging.

C You merged the branches in the wrong order.

D The base commit is missing from the repository.

💡 Hint

Think about what happens if Git does not see your conflict resolutions.

If you fix conflicts but do not stage the files with 'git add', Git thinks conflicts remain and will not complete the merge.

✅ Best Practice

expert

Best practice to minimize three-way merge conflicts

Which practice best helps reduce the chance of complex three-way merge conflicts in a team project?

A Use force push to overwrite remote branches regularly.

B Avoid committing changes until the feature is fully complete.

C Frequently pull and merge changes from the main branch into your feature branch.

D Delete the main branch and work only on feature branches.

💡 Hint

Think about keeping your branch up to date with others' changes.

Regularly merging main into your feature branch keeps your work current and reduces conflicts when merging back.