Application Developer can automatically detect the conflict, compare the files, and merge the changes.

• Application Developer可以自动检测冲突、比较文件以及合并更改。