Once again I need to spend some time explaining grungy details of how SCM tools work.
又一次我需要花些时间解释软件配置管理工具如何工作的陈词滥调。
In some SCM tools, the rollback feature really does make version 7 disappear forever.
有些配置管理工具，回滚功能真的使版本7永远消失掉了。
For now I will simply mention that most SCM tools include features that can safely do a three-way merge automatically.
现在我将简单的提及，大多数的配置管理工具包含的功能都能够安全的做三种方式的自动合并。
应用推荐