Merge of Word docs?

From: Simmons, Bryan <bsimmons_at_gpworldwide.com>
Date: 2004-01-30 15:31:39 CET

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?

Regards,

Bryan Simmons
Network Systems Engineer
General Physics
410.379.3710
bsimmons@genphysics.com

---------------------------------------------------------------------
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:19:08 2004

This message: [ Message body ]
Next message: kfogel_at_collab.net: "Re: cvs2svn.py takes long but sleeps?"
Previous message: Kai Bartels: "cvs2svn.py takes long but sleeps?"
Next in thread: Brian W. Fitzpatrick: "Re: Merge of Word docs?"
Reply: Brian W. Fitzpatrick: "Re: Merge of Word docs?"
Reply: Luis Malheiro: "Re: Merge of Word docs?"
Maybe reply: Bryan Simmons: "RE: Merge of Word docs?"

Contemporary messages sorted: [ By Date ] [ By Thread ] [ By Subject ] [ By Author ] [ By messages with attachments ]