Resolving merge conflicts in Git - Cheat Sheet & Quick Revision

Recall & Review

beginner

What is a merge conflict in Git?

A merge conflict happens when Git cannot automatically combine changes from two branches because the same part of a file was changed differently in each branch.

beginner

How does Git mark the conflicting areas in a file?

Git uses special markers like <<<<<<<, =======, and >>>>>>> to show the conflicting parts from each branch inside the file.

beginner

What is the first step to resolve a merge conflict?

Open the conflicted file, find the conflict markers, and decide how to combine or choose between the changes.

beginner

Which Git command do you use to mark a conflict as resolved after editing?

Use git add <filename> to mark the conflict as resolved before committing.

beginner

What command finalizes the merge after resolving conflicts?

Run git commit to complete the merge once all conflicts are resolved and staged.

What does Git use to show conflicting changes inside a file?

A Separate files for conflicts

B Color codes only

C No indication, manual check needed

D Special markers like <<<<<<< and >>>>>>>

Git inserts markers like <<<<<<<, =======, and >>>>>>> to highlight conflicting sections.

After fixing a merge conflict in a file, what is the next Git command to run?

A git clone

B git add <filename>

C git push

D git merge

You must stage the resolved file with git add before committing.

What causes a merge conflict in Git?

A Two branches change the same lines differently

B Branches have different names

C Files are too large

D No internet connection

Conflicts occur when the same lines in a file are changed differently in two branches.

Which command completes the merge after resolving conflicts?

A git commit

B git status

C git branch

D git reset

git commit finalizes the merge after all conflicts are resolved and staged.

If you want to abort a merge and return to the previous state, which command do you use?

A git reset --hard

B git checkout master

C git merge --abort

D git stash

git merge --abort cancels the merge and restores the state before merging.

Explain the steps you take to resolve a merge conflict in Git.

Think about what Git shows you and how you fix it step by step.

What are the common causes of merge conflicts and how can you avoid them?

Consider why conflicts happen and good teamwork habits.