[cvsnt] Ignore merging a certain text file

Tony Hoyle tony.hoyle at march-hare.com
Wed Jan 7 17:36:15 GMT 2009

Attila Strba wrote:
> Hi Guys,
> is there a possibility to setup in the sandbox a rule to avoid merging a certain file?
> In Keil uVision if the *.uv2 text file is merged it usually gots corrupted. The file can't be in ignore list because if creating a new sandbox the project needs this file.
> thanx for any help, 

You could just mark it as binary, then it'll never get merged.

If you don't want changes to it to be committed as new revisions, then 
mark it as static.


More information about the cvsnt mailing list