如何从svn更新时从文件中排除代码行？
问题描述：
假设我有一个html文件在本地更改但是从SVN更新时，
它还会更新整个html文件。
我想要更新那个文件但是想避免更新html文件的某些代码行。
有SVN属性IGNORE，它避免了在这种情况下不需要的整个html文件。
请提供任何程序或脚本或任何方法来实现该方案。
Suppose I have a html file which is been changed locally but while taking update from SVN,
It also updates the whole html file.
I want update of that file but want to avoid to update some lines of code of html file.
There is SVN property "IGNORE" which avoid the whole html file which is not required in this scenario.
Please provide any program or script or any ways to achieve the scenario.
答
该过程称为合并。客户端上的工具可以为该任务提供GUI。
That process is called "Merging". The tools on your client may provide a GUI for that task.