Re: ignore conflict option?

On 7/12/07, Miller, Eric <Eric.Miller@amd.com> wrote:
> Yes, they must be checked in. They are generated files created by an
> interactive application. Unfortunately the files are shared by various
> pieces of the "real" source data and the operations that trigger
> creation and modification of these files is not well known.
>
> Basically I just want to auto-resolve by keeping the local version. I
> also don't want update creating foo.rXXXX, foo.mine, etc. files every
> time there is a conflict on these particular shared files.

A feature like that has landed on trunk just last week. It's a
per-update switch though (ie not per file)...

HTH,

Erik.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jul 14 15:38:36 2007