[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Merge vs Lock

From: Mark Shead <sheadm_at_optimalinternet.com>
Date: 2005-11-14 15:40:22 CET

Merging works well as long as people aren't making changes to the exact
same lines of the file. If this happens then the second developer to
submit a change will need to decide which version of that particular
line should be used. In most work environments you don't have
programmers trying to work on the same lines at the same time, so this
rarely happens as long as people are checkin in their changes and
updating frequently.
If you have people checking out the source and then working for two
weeks before updating or checking it back in, you may run into some


From: Datatal AB - Jonas Gauffin [mailto:jonas@datatal.se]
Sent: Monday, November 14, 2005 9:23 AM
To: users@subversion.tigris.org
Subject: Merge vs Lock



I'm an old SourceSafe user which has just installed SubVersion. SF uses
locking on files when checking out which I feel is safer than the merge
method. Or am I wrong? Do the merging work at all time? We are going to
use svn for our C++ projects.



Received on Mon Nov 14 15:47:51 2005

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.