Re: suggestions
Jim Hart <[email protected]> 13 Apr 2005 16:33:19 -0400
| Newsgroups | gmane.comp.web.wiki.awkiawki.user |
|---|---|
| Message-ID | <[email protected]> |
On Tue, 2005-04-12 at 09:55, David W. Talmage wrote: > > > >If two people have the same page open for editing and both save their > >changes, they are in trouble and on looses. Just because it rarely > >happens doesn't change the fact that it's trouble. > > RCS should take care of that for you. Even if one version clobbers > the other, the RCS history lets you easily retrieve the "loser". > This is where CVS is a better choice. It can, most of the time, merge changes made by different people to the same file. So, nobody loses. The file ends up with the work of both editors. In those few cases where the changes directly conflict, CVS includes both in the resulting file so that a human being can resolve the conflict. In no case does one have to retrieve a file from history and manually apply changes, or run diffs or whatever. Regards to all, Jim Hart ------------------------------------------------------- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click