22-Mar-2004, 12:52 AM
Hi,
I'm trying to figure out how to ignore a certain section when I'm merging two text files. All files in my source tree contains a change history section in the beginning that changes constantly and this results in complex merges all the time even though the code merges are trivial. So my question is:
Is there any way to tag a section as trivial and complex so that the complex part must be manually merged (Change history) and the rest is automatically merged assuming that the code doesn't contain complex changes?
Thanks in advance,
Rune
I'm trying to figure out how to ignore a certain section when I'm merging two text files. All files in my source tree contains a change history section in the beginning that changes constantly and this results in complex merges all the time even though the code merges are trivial. So my question is:
Is there any way to tag a section as trivial and complex so that the complex part must be manually merged (Change history) and the rest is automatically merged assuming that the code doesn't contain complex changes?
Thanks in advance,
Rune