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.
------------------------------------------------------
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
|
This is an archived mail posted to the TortoiseSVN Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.