Git

What merge strategies are you familiar with?

Difficulty: unrated

Source: bregman-arie/devops-exercises by Arie Bregman

Answer

Mentioning two or three should be enough and it's probably good to mention that 'recursive' is the default one.

recursive resolve ours theirs

This page explains it the best: https://git-scm.com/docs/merge-strategies