本课内容目前为英文。
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.