Re: [Scribia-dev] Commit: new About Box

[Ben H. <bh...@al...>]

At 11:31 PM -0800 3/14/01, Lark wrote:
>At 9:12 PM -0500 3/13/01, Charles Lechasseur wrote:
>>well, it's nothing fancy, but it's a start: i've committed a (hopefully)
>>nicer about box. feel free to adjust the layout and/or text style if
>>needed...
>
>Looks good!
>
>Now that multiple people commit things, we need to take care to 
>coordinate modifications to the binary files in the repository 
>(basically, the resource files). CVS cannot automatically merge 
>changes there, like it does for text files.

(showing my ignorance...)

It cant? It seems to on my end... not sure i understand. Its in the 
MacCVS Pro prefs, "auto merge binary files". Seems to work...  Please 
explain.

Charles' submitted resources merged in fine, i didnt have to do 
anything manually. Likewise, on Commit, i got no errors.

-Ben
-- 
NOTE: Please change my address in your address book from bh...@sa...
to bh...@al... as my UCSD address will be permanent.
<http://freepages.sf.rootsweb.com/~bhines/> - My Genealogy Pages