Re: Enforce always conflict during the update procedure?

On Thu, 7 Jul 2005 15:54:45 +0200, Ulrich Eckhardt
<eckhardt@satorlaser.com> wrote:

>Totally untested idea: set the mime-type of the file to binary. I believe this
>will keep Subversion from trying to merge it.

You can pick just about any non-text/* MIME type, but beware that it
will also prevent things like svn blame or svn diff from working. More
details at http://subversion.tigris.org/faq.html#binary-files

Greg

-- 
This post represents the views of the author and does
not necessarily accurately represent the views of BT.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org