Exclude files from merge?

normancz
normancz
Hi,  I have a Delphi-project with two versions 1.0 and 2.0 in the repository and use the merge-function to take bugfixes from 1.0 into 2.0.    This works without problems on the source-files. But it conflicts on special-files for the Delphi-IDE. Is there a special attribut to exclude this files? Some projectfiles must be in the repository, but merging is dangerous and not needed.    Btw, I use TortoiseSVN.    Thx, and bye   Norman

Last updated

Manuzhai
Manuzhai
Try using the svn:ignore property (you can also Ignore files through Tortoises interface).

1-2 of 2

Reply to this discussion

You cannot edit posts or make replies: You should be logged in before you can post.