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

RE: Re: Tree Conflict Issues

From: Bryan Slatner <bryan_at_slatner.com>
Date: Mon, 16 Nov 2009 07:48:15 -0800 (PST)

After some digging, I think my problem relates to corrupted merge info.

If I check out the trunk, then do "merge range of revisions" and pick the 4 revisions from the branch that I've recently made, the merge works perfectly with no tree conflicts.

I'm not sure how to correct this.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2418567

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-11-16 16:48:17 CET

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