Two or more different changes to the same line of code in situations where two or more developers have checked out and edited the same file.

• 在两个或者多个开发人员签出并编辑同一个文件的情况下对同一行代码的两个或者多个不同的更改。