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

Re: Tree conflict after a simple delete

From: Stein Somers <ssomers_at_opnet.com>
Date: Wed, 23 Sep 2009 14:43:01 +0200

Giulio Troccoli wrote:
> Does the tree conflict happen because the file is deleted?

Yes.

> If the files was simply modified, would Subversion merge it? Would it give a text conflict?

Both are possible. That is old school merging. If it's a text file and
changes are at different lines in the file, everything is reliably merged
automatically. If there is doubt, the file is marked as a text conflict. Many
tools exist to help you resolve those conflicts. Not so yet for tree conflicts. 

-- 
Stein
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2398864
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-23 14:44:06 CEST

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.