Oracle interview question

how do you resolve git conflicts and how why do they occur?