メインコンテンツへ移動
0

このレッスンは、現在英語のみです。

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.