Merge conflicts why they happen in Git - Practice Problems & Coding Challenges

Challenge - 5 Problems

🧠 Conceptual

intermediate

Why do merge conflicts occur in Git?

Imagine two friends editing the same paragraph in a shared document at the same time. What causes Git to show a merge conflict when combining changes?

A Because the commit messages are identical in both branches.

B Because Git lost the internet connection during the merge process.

C Because one branch deleted the entire file while the other branch added new files.

D Because both branches changed the same lines differently, so Git cannot decide which change to keep.

💡 Hint

Think about what happens when two people edit the same exact sentence differently.

Merge conflicts happen when Git tries to combine changes but finds that the same lines were changed in different ways in two branches. It cannot automatically decide which change to keep, so it asks the user to resolve the conflict.

💻 Command Output

intermediate

What is the output when a merge conflict happens?

You run git merge feature but the branches have conflicting changes. What message does Git show?

Git

git merge feature

A Nothing happens, the merge is silent.

B

Auto-merging file.txt
CONFLICT (content): Merge conflict in file.txt
Automatic merge failed; fix conflicts and then commit the result.

C Error: branch 'feature' does not exist.

D Merge completed successfully with no conflicts.

💡 Hint

Look for keywords like 'CONFLICT' and 'Automatic merge failed'.

When Git cannot merge automatically due to conflicting changes, it shows a message indicating which files have conflicts and that the user must fix them before committing.

❓ Troubleshoot

advanced

How to identify conflicting files after a merge conflict?

After a merge conflict, which Git command lists the files that have conflicts needing resolution?

A git status

B git branch

C git log

D git commit

💡 Hint

Think about which command shows the current state of your working directory and staged files.

git status shows files with conflicts marked as 'both modified', helping you identify which files need fixing.

🔀 Workflow

advanced

What is the correct workflow to resolve a merge conflict?

After a merge conflict, what is the correct sequence of steps to fix and complete the merge?

A 4,1,2,3

B 1,4,2,3

C 4,2,1,3

D 2,1,4,3

💡 Hint

Remember you must start the merge, then fix conflicts, stage changes, and finally commit.

The correct workflow is to run git merge first, then fix conflicts in files, stage the fixed files, and commit the merge.

✅ Best Practice

expert

Why is it best to pull frequently to avoid merge conflicts?

Which reason best explains why regularly pulling changes from the main branch helps reduce merge conflicts?

A Because Git locks files when you pull, preventing others from editing them.

B Because pulling deletes your local changes automatically to avoid conflicts.

C Because it keeps your branch updated with others' changes, reducing the chance of conflicting edits accumulating.

D Because pulling merges all branches into one automatically without conflicts.

💡 Hint

Think about how staying updated helps avoid surprises when merging.

Pulling often keeps your branch close to the main branch's state, so you resolve small conflicts early and avoid big conflicts later.