If your team is allowing concurrent development to happen, it will periodically face a situation where two versions of a file need to be merged into one.

• 如果你的团队允许并发开发，它就得周期性的面对一个文件的两个版本需要合并成一个的情况。