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

[Charles L. <da...@sy...>]

>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.

it can update binary files, but not merge them. (the prefs option reads
"Auto-merge text files and update binary files", i believe.)

as long as you haven't changed the resource file, you can check out a
modified version and it will simply update the file. but if you had
yourself modified the file, i think CVS would tell you that there are
conflicts which you must resolve by hand.


--

charles lechasseur - da...@sy...
http://www3.sympatico.ca/danov/marathon/

  "The butts of evil are awaiting my bootprints!"
     - Minsc