[Omake] removing doc/ps/omake-doc.{ps,pdf} from repository
Aleksey Nogin
nogin at cs.caltech.edu
Fri Jun 16 10:32:09 PDT 2006
On 16.06.2006 10:26, Erick Tryzelaar wrote:
> What about setting the files so that they're binary? According to these
> docs,
>
> http://svnbook.red-bean.com/nightly/en/svn.advanced.props.html#svn.advanced.props.special.mime-type
>
>
> subversion won't attempt to merge if the mime type doesn't start with
> "text/".
>
They are already binary and Subversion does not try to merge them. It
just detects that they were changed differently on SVN and locally and
thus reports a conflict - without trying to merge anything.
--
Aleksey Nogin
Home Page: http://nogin.org/
E-Mail: nogin at cs.caltech.edu (office), aleksey at nogin.org (personal)
Office: Moore 04, tel: (626) 395-2200
More information about the Omake
mailing list