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

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

From: Steve Cohen <scohen_at_javactivity.org>
Date: Fri, 21 Aug 2009 16:31:21 -0500

Mark Phippard wrote:
> 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.
>
>
Well, the subclipse user interface is very confusing. Near as I can
tell, these are files that were moved months ago on different branches.
I have dealt with these conflicts before. Why the "conflict status"
keeps popping up again is a total mystery. And it's a bit annoying that
I have to accept the resolution one file at a time.

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2386145

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2009-08-21 23:32:01 CEST

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