Re: [Subclipse-users] What the bloody h are "tree conflicts"?

On Fri, Aug 21, 2009 at 12:49 PM, Steve Cohen<scohen_at_javactivity.org> wrote:
> and how do I get rid of them.
>
> Every single one of these so-called conflicts is between two versions of
> the file that are identical and have not changed.  I don't even
> understand what subclipse is trying to tell me here.

You mean Subversion. Subclipse does not raise conflicts, it just lets
you know what Subversion is saying.

Tree conflicts are a new feature added in SVN 1.6. There is info in
the SVN book here:

http://svnbook.red-bean.com/nightly/en/svn.tour.treeconflicts.html

Subclipse has a Show Tree Conflicts option (use at the Project level)
which shows the details along with an option that helps you resolve
them.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2386067
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].