이 레슨은 당분간 영어로 제공돼요.
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.
이 레슨은 당분간 영어로 제공돼요.
A conflict is not an error. It is Git saying: you both changed this line, please decide. Here is how to answer calmly.