Merge Conflicts in Version Control Quiz

1. What is the purpose of 'git rerere' (reuse recorded resolution)?

To automatically reapply previously recorded conflict resolutions

To remove all merge history from the repository

To prevent conflicts from occurring in the future

To create a backup of conflicting files

2. After resolving all conflicts and staging files, what final step completes the merge?

Git merge --finish

Git commit with a merge commit message

Git push to remote repository

Git branch -d to delete the merged branch

3. What is a three-way merge and when is it used?

Merging three branches simultaneously at once

Using a common ancestor to intelligently merge two versions

Merging changes from three different developers

A method that always prevents conflicts

4. How can you view the differences between conflicting versions using Git?

Git diff --conflict=merge

Git show HEAD

Git log --oneline

Git branch -v

5. What does the --no-ff flag do when merging branches?

Forces a fast-forward merge without creating a merge commit

Creates a merge commit even if a fast-forward is possible

Prevents the merge from proceeding

Removes merge history from the log

6. In collaborative development, what is the best practice to minimize merge conflicts?

Merge all changes into a single branch immediately

Keep branches short-lived and frequently sync with main

Avoid using branches altogether

Merge only once per week

7. What should you do before committing a merge to ensure no conflicts remain?

Run git status and verify all conflicts are resolved

Delete the conflicting files and recreate them

Push to remote and check the CI/CD pipeline

Create a new branch and start over

8. Which command allows you to continue a rebase after resolving conflicts?

Git rebase --skip

Git rebase --continue

Git rebase --abort

Git rebase --resolve

9. What is a rebase conflict and how does it differ from a merge conflict?

A rebase conflict occurs during interactive rebase and requires different resolution

Rebase conflicts cannot be resolved, only avoided

Rebase conflicts affect the entire repository history

There is no difference between rebase and merge conflicts

10. After resolving conflicts manually, what command stages the resolved files?

Git resolve

Git add

Git commit -m 'resolved'

Git merge --continue

11. What is a merge conflict in version control?

When two branches cannot be combined due to conflicting changes in the same file

When a commit fails to push to the remote repository

When a user lacks permissions to merge branches

When the repository becomes corrupted during a merge operation

12. Which tool can you use to resolve conflicts with a graphical interface?

Git diff

Git mergetool

Git log

Git branch

13. In a merge conflict, what does the HEAD marker represent?

The most recent commit in the repository

The changes from the current branch you are on

The incoming changes from the branch being merged

The original state before any changes

14. What is a recursive merge strategy used for?

Merging more than two branches simultaneously

Merging two branches with a common ancestor

Automatically resolving all text conflicts

Creating backups before merging

15. How do you abort a merge operation that has conflicts?

Git merge --cancel

Git reset --hard HEAD

Git merge --abort

Git revert HEAD

16. Which strategy resolves conflicts by accepting all changes from the incoming branch?

Git merge --ours

Git merge --theirs

Git merge --abort

Git merge --squash

17. What does 'git status' display during a merge conflict?

Only the files that were successfully merged

Files with unresolved conflicts marked as 'both modified'

A list of all commits in the merge history

The size of each conflicting file

18. When resolving a merge conflict, the ======= line separates which two versions?

The original file and the merged result

The current branch and the incoming branch

The local copy and the remote copy

The staged changes and unstaged changes

19. In Git, what markers indicate the start of a conflict section?

>>>>>> and

{{{{ and }}}}

[CONFLICT] and [END]

20. Which Git command initiates a merge operation between two branches?

Git combine

Git merge

Git join

Git sync

AutoOps+ Resolving Merge Conflicts in Version Control Quiz