Cette leçon est en anglais pour le moment.
Conflicts are normal
A conflict is not an error. It is Git saying: you both changed this line, please decide. Here is how to answer calmly.
Cette leçon est en anglais pour le moment.
A conflict is not an error. It is Git saying: you both changed this line, please decide. Here is how to answer calmly.