Pergunta de entrevista da empresa BAE Systems USA

How would you identify and correct a merge conflict with Git?