Therefore , to use source control with remote web sites , your web site project must be configured to use the source control system on the server where the files are located 因此,若要将源代码管理用于远程网站,网站项目必须配置为使用文件所处的服务器上的源代码管理系统。
The source code control system detects that the file has been changed by someone else since you last checked it out and merges your changes with the file in the repository 源代码管理系统检测到该文件自您上次将其签出后已由其他人进行了更改,并将您的更改与储存库中的该文件进行合并。
Most source code control systems allow multiple developers to check the same file out at the same time , which means that two or more developers might edit a file at the same time 大多数源代码管理系统允许多个开发人员同时签出同一文件,这意味着两个或更多开发人员可以同时编辑一个文件。
However , if the file has changed since you checked out your version , the source code control system attempts to merge your changes with the other changes it finds in the file 但是,如果文件自您签出您的版本后已更改,则源代码管理系统会尝试将您的更改与在该文件中发现的其他更改进行合并。
A good source code management system can do some of the more tedious parts of this automatically , which makes merging patches faster and allows greater throughput for patches going into the kernel 一个好的源代码管理系统可以自动地完成其中一些更为复杂的部分工作,这样可以更快地融合补丁,并使更多的补丁加入到内核中。