Re: Merge of Word docs?

On Fri, 2004-01-30 at 09:55, Brian W. Fitzpatrick wrote:
> On Fri, 2004-01-30 at 08:31, Simmons, Bryan wrote:
> > Ok, so one of the basic characteristics of subversion is that when a
> > collision occurs with respect to two people checking in another revision
> > at the same time the last person to check in has to manually merge two
> > revs.
> > How is this handled with Word files or graphics or some other non-ASCII
> > file?
>
> The user has to figure it out somehow. It's not pretty, and it's one of
> the reason's we've got locking slated as a future feature (albeit post
> 1.06)

Err. That's supposed to read "1.0" How'd that 6 get in there?

-Fitz

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jan 30 16:58:49 2004