Re: how to set an ignore list for merge

Fijn,

2007/1/19, Stefan K�ng <tortoisesvn@gmail.com>:
> fjin wrote:
>
> > I want to use merge to update my branch code from trunk. But in my
> > branch code, i want some files can be ignored when merge. But i can't
> > find how to set in tortoisesvn, can you tell me?
>
> You can't ignore files when merging or updating. You can only ignore
> unversioned files.

You can, however, revert the files that you want to ignore before
commiting the merged branch. That puts them back to the state before
the merge (but only if you had a clean branch working copy before you
started the merge).

Norbert

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sun Jan 21 11:41:28 2007