Many SCM tools contain special features to assist with this sort of a merge.

• 一些配置管理工具包含支持这种合并的特殊功能。