Pregunta de entrevista de CitiusTech

how to resolve merge conflicts in git