Resolving merge conflicts in Git - Practice Problems & Coding Challenges

Challenge - 5 Problems

💻 Command Output

intermediate

What is the output after a failed merge due to conflicts?

You run git merge feature-branch but there are conflicts. What message does Git show?

A

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

B Merge made by the 'recursive' strategy.

C Already up to date.

D fatal: Not a git repository (or any of the parent directories): .git

💡 Hint

Think about what Git says when it cannot automatically merge files.

When Git encounters conflicts during a merge, it stops and shows a message indicating which files have conflicts and that you must fix them before committing.

🔀 Workflow

intermediate

Correct sequence to resolve a merge conflict

Which sequence of commands correctly resolves a merge conflict and completes the merge?

A 3,2,1,4

B 2,1,3,4

C 1,3,2,4

D 1,2,3,4

💡 Hint

Start by checking status, then fix files, stage them, and commit.

First, check which files have conflicts with 'git status'. Then edit those files to resolve conflicts. After fixing, stage the files with 'git add'. Finally, commit the merge with 'git commit'.

❓ Troubleshoot

advanced

Why does 'git commit' fail after resolving conflicts?

You resolved all conflicts and staged the files, but git commit still fails with the message: error: Committing is not possible because you have unmerged files. What is the most likely cause?

A Your repository is corrupted and needs to be recloned.

B You need to run <code>git merge --continue</code> instead of <code>git commit</code>.

C You forgot to stage all conflicted files after resolving conflicts.

D You must delete the conflicted files before committing.

💡 Hint

Think about what Git requires before committing a merge.

Git requires all conflicted files to be staged (added) after resolving conflicts before committing. If any conflicted files remain unstaged, commit will fail.

🧠 Conceptual

advanced

Understanding conflict markers in files

What do the conflict markers <<<<<<<, =======, and >>>>>>> in a file indicate?

A They mark the conflicting sections from the current branch and the branch being merged.

B They are comments added by Git to explain the merge process.

C They indicate lines that were deleted during the merge.

D They are placeholders for unresolved binary files.

💡 Hint

Think about how Git shows differences inside a conflicted file.

Git inserts these markers to show the conflicting parts: the section between <<<<<<< and ======= is from your current branch, and the section between ======= and >>>>>>> is from the branch being merged.

✅ Best Practice

expert

Best practice to avoid complex merge conflicts

Which practice helps reduce the chance of complex merge conflicts in a team working on the same codebase?

A Avoid committing changes until your feature is fully complete.

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

C Use force push to overwrite remote branches when conflicts occur.

D Work on large features in a single long-lived branch without syncing.

💡 Hint

Think about keeping your branch up to date with others.

Regularly syncing your branch with the main branch reduces divergence and helps catch conflicts early, making them easier to resolve.