Pergunta de entrevista da empresa TSMC

Q: How did you resolve merge conflicts in collaborative tasks?