Explanation why this merge conflict happens

后端 未结 0 1997
礼貌的吻别
礼貌的吻别 2021-01-22 21:23

Imagine I have master branch which has file with content:

1
2
3
4

Now, imagine I make a test branch out of it, and add a line to it:

相关标签:
回答
  • 消灭零回复
提交回复
热议问题