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

Re: Merging files

From: Tony Overfield <toverfield_at_yahoo.com>
Date: 2004-12-17 21:38:34 CET

> John McClement wrote:
> I am evaluating subversion and am tring to understand one feature. I
> understand that when 2 different users checkout a file and both make
> changes, then subversion will merge these by default. I understand that the
> changes are committed to the repository, and only flag a conflict if changes
> have been made by both users in the same line of the file.
> However, in my situation, I would never want merging of files to occur. I
> would always want a conflict to be flagged.

I once had this (mis)understanding too. The second user's commit does
not cause any kind of a merge, but rather an "out of date" error message.
The second user must merge the repository's changes into his own working
copy by using "update." It is this "update" operation that performs
automatic merging, but it does not change the repository at all.
The second user should then verify that the merge (update) did the right
things to his working copy before he attempts to commit again.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Dec 17 21:40:54 2004

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.