Re: ignore conflict option?

Should the files be checked in at all - can they be generated as part
of the build process and not versioned (since the source material is
versioned already).

--
Talden
On 7/12/07, Miller, Eric <Eric.Miller@amd.com> wrote:
> Can anyone tell me if there is a way to modify the way conflicts are
> handled for particular files?
>
> I have run into a situation where auto-generated binary files are
> creating conflicts between working copies.  It isn't practical to
> require locks on these files and all I really want is to check in
> regardless of conflict - whatever is in the working copy wins, more or
> less.
>
> Is there a property or switch that I can set that would disable conflict
> awareness for some files?
>
> Thanks,
>
> Eric
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org