Pergunta de entrevista da empresa LexisNexis Legal & Professional

Projects I have worked on. Version control. SQL basics. How do I resolve conflicts?